diff options
author | Matt Helsley <matthltc@us.ibm.com> | 2008-10-18 23:27:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:52:33 -0400 |
commit | 83224b08372be48d5fcefedc4886457da29130c8 (patch) | |
tree | 426800e7838472b2f319c85cedc3555b98c30707 | |
parent | 5e9a0f023bee02bfb94e08590d998660c01f5a49 (diff) |
container freezer: add TIF_FREEZE flag to all architectures
This patch series introduces a cgroup subsystem that utilizes the swsusp
freezer to freeze a group of tasks. It's immediately useful for batch job
management scripts. It should also be useful in the future for
implementing container checkpoint/restart.
The freezer subsystem in the container filesystem defines a cgroup file
named freezer.state. Reading freezer.state will return the current state
of the cgroup. Writing "FROZEN" to the state file will freeze all tasks
in the cgroup. Subsequently writing "RUNNING" will unfreeze the tasks in
the cgroup.
* Examples of usage :
# mkdir /containers/freezer
# mount -t cgroup -ofreezer freezer /containers
# mkdir /containers/0
# echo $some_pid > /containers/0/tasks
to get status of the freezer subsystem :
# cat /containers/0/freezer.state
RUNNING
to freeze all tasks in the container :
# echo FROZEN > /containers/0/freezer.state
# cat /containers/0/freezer.state
FREEZING
# cat /containers/0/freezer.state
FROZEN
to unfreeze all tasks in the container :
# echo RUNNING > /containers/0/freezer.state
# cat /containers/0/freezer.state
RUNNING
This patch:
The first step in making the refrigerator() available to all
architectures, even for those without power management.
The purpose of such a change is to be able to use the refrigerator() in a
new control group subsystem which will implement a control group freezer.
[akpm@linux-foundation.org: fix sparc]
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Matt Helsley <matthltc@us.ibm.com>
Acked-by: Pavel Machek <pavel@suse.cz>
Acked-by: Serge E. Hallyn <serue@us.ibm.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Nigel Cunningham <nigel@tuxonice.net>
Tested-by: Matt Helsley <matthltc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/alpha/include/asm/thread_info.h | 2 | ||||
-rw-r--r-- | arch/avr32/include/asm/thread_info.h | 1 | ||||
-rw-r--r-- | arch/h8300/include/asm/thread_info.h | 2 | ||||
-rw-r--r-- | arch/m68knommu/include/asm/thread_info.h | 2 | ||||
-rw-r--r-- | arch/s390/include/asm/thread_info.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/thread_info_32.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/thread_info_64.h | 2 | ||||
-rw-r--r-- | include/asm-cris/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/thread_info.h | 1 | ||||
-rw-r--r-- | include/asm-parisc/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-um/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-xtensa/thread_info.h | 2 |
12 files changed, 22 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h index 15fda434442..d069526bd76 100644 --- a/arch/alpha/include/asm/thread_info.h +++ b/arch/alpha/include/asm/thread_info.h | |||
@@ -74,12 +74,14 @@ register struct thread_info *__current_thread_info __asm__("$8"); | |||
74 | #define TIF_UAC_SIGBUS 7 | 74 | #define TIF_UAC_SIGBUS 7 |
75 | #define TIF_MEMDIE 8 | 75 | #define TIF_MEMDIE 8 |
76 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal */ | 76 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal */ |
77 | #define TIF_FREEZE 16 /* is freezing for suspend */ | ||
77 | 78 | ||
78 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 79 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
79 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) | 80 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) |
80 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) | 81 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) |
81 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) | 82 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) |
82 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) | 83 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) |
84 | #define _TIF_FREEZE (1<<TIF_FREEZE) | ||
83 | 85 | ||
84 | /* Work to do on interrupt/exception return. */ | 86 | /* Work to do on interrupt/exception return. */ |
85 | #define _TIF_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED) | 87 | #define _TIF_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED) |
diff --git a/arch/avr32/include/asm/thread_info.h b/arch/avr32/include/asm/thread_info.h index 294b25f9323..4442f8d2d42 100644 --- a/arch/avr32/include/asm/thread_info.h +++ b/arch/avr32/include/asm/thread_info.h | |||
@@ -96,6 +96,7 @@ static inline struct thread_info *current_thread_info(void) | |||
96 | #define _TIF_MEMDIE (1 << TIF_MEMDIE) | 96 | #define _TIF_MEMDIE (1 << TIF_MEMDIE) |
97 | #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) | 97 | #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) |
98 | #define _TIF_CPU_GOING_TO_SLEEP (1 << TIF_CPU_GOING_TO_SLEEP) | 98 | #define _TIF_CPU_GOING_TO_SLEEP (1 << TIF_CPU_GOING_TO_SLEEP) |
99 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
99 | 100 | ||
100 | /* Note: The masks below must never span more than 16 bits! */ | 101 | /* Note: The masks below must never span more than 16 bits! */ |
101 | 102 | ||
diff --git a/arch/h8300/include/asm/thread_info.h b/arch/h8300/include/asm/thread_info.h index aafd4d322ec..700014d2155 100644 --- a/arch/h8300/include/asm/thread_info.h +++ b/arch/h8300/include/asm/thread_info.h | |||
@@ -89,6 +89,7 @@ static inline struct thread_info *current_thread_info(void) | |||
89 | TIF_NEED_RESCHED */ | 89 | TIF_NEED_RESCHED */ |
90 | #define TIF_MEMDIE 4 | 90 | #define TIF_MEMDIE 4 |
91 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ | 91 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ |
92 | #define TIF_FREEZE 16 /* is freezing for suspend */ | ||
92 | 93 | ||
93 | /* as above, but as bit values */ | 94 | /* as above, but as bit values */ |
94 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 95 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
@@ -96,6 +97,7 @@ static inline struct thread_info *current_thread_info(void) | |||
96 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) | 97 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) |
97 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) | 98 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) |
98 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) | 99 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) |
100 | #define _TIF_FREEZE (1<<TIF_FREEZE) | ||
99 | 101 | ||
100 | #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ | 102 | #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ |
101 | 103 | ||
diff --git a/arch/m68knommu/include/asm/thread_info.h b/arch/m68knommu/include/asm/thread_info.h index 0c9bc095f3f..82529f424ea 100644 --- a/arch/m68knommu/include/asm/thread_info.h +++ b/arch/m68knommu/include/asm/thread_info.h | |||
@@ -84,12 +84,14 @@ static inline struct thread_info *current_thread_info(void) | |||
84 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling | 84 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling |
85 | TIF_NEED_RESCHED */ | 85 | TIF_NEED_RESCHED */ |
86 | #define TIF_MEMDIE 4 | 86 | #define TIF_MEMDIE 4 |
87 | #define TIF_FREEZE 16 /* is freezing for suspend */ | ||
87 | 88 | ||
88 | /* as above, but as bit values */ | 89 | /* as above, but as bit values */ |
89 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 90 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
90 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) | 91 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) |
91 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) | 92 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) |
92 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) | 93 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) |
94 | #define _TIF_FREEZE (1<<TIF_FREEZE) | ||
93 | 95 | ||
94 | #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ | 96 | #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ |
95 | 97 | ||
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h index ea40a9d690f..de3fad60c68 100644 --- a/arch/s390/include/asm/thread_info.h +++ b/arch/s390/include/asm/thread_info.h | |||
@@ -99,6 +99,7 @@ static inline struct thread_info *current_thread_info(void) | |||
99 | #define TIF_31BIT 18 /* 32bit process */ | 99 | #define TIF_31BIT 18 /* 32bit process */ |
100 | #define TIF_MEMDIE 19 | 100 | #define TIF_MEMDIE 19 |
101 | #define TIF_RESTORE_SIGMASK 20 /* restore signal mask in do_signal() */ | 101 | #define TIF_RESTORE_SIGMASK 20 /* restore signal mask in do_signal() */ |
102 | #define TIF_FREEZE 21 /* thread is freezing for suspend */ | ||
102 | 103 | ||
103 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 104 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
104 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) | 105 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) |
@@ -112,6 +113,7 @@ static inline struct thread_info *current_thread_info(void) | |||
112 | #define _TIF_USEDFPU (1<<TIF_USEDFPU) | 113 | #define _TIF_USEDFPU (1<<TIF_USEDFPU) |
113 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) | 114 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) |
114 | #define _TIF_31BIT (1<<TIF_31BIT) | 115 | #define _TIF_31BIT (1<<TIF_31BIT) |
116 | #define _TIF_FREEZE (1<<TIF_FREEZE) | ||
115 | 117 | ||
116 | #endif /* __KERNEL__ */ | 118 | #endif /* __KERNEL__ */ |
117 | 119 | ||
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h index 29899fd5b1b..80fe547c3f4 100644 --- a/arch/sparc/include/asm/thread_info_32.h +++ b/arch/sparc/include/asm/thread_info_32.h | |||
@@ -135,6 +135,7 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *) | |||
135 | #define TIF_POLLING_NRFLAG 9 /* true if poll_idle() is polling | 135 | #define TIF_POLLING_NRFLAG 9 /* true if poll_idle() is polling |
136 | * TIF_NEED_RESCHED */ | 136 | * TIF_NEED_RESCHED */ |
137 | #define TIF_MEMDIE 10 | 137 | #define TIF_MEMDIE 10 |
138 | #define TIF_FREEZE 11 /* is freezing for suspend */ | ||
138 | 139 | ||
139 | /* as above, but as bit values */ | 140 | /* as above, but as bit values */ |
140 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 141 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
@@ -148,6 +149,7 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *) | |||
148 | #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | \ | 149 | #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | \ |
149 | _TIF_SIGPENDING | \ | 150 | _TIF_SIGPENDING | \ |
150 | _TIF_RESTORE_SIGMASK) | 151 | _TIF_RESTORE_SIGMASK) |
152 | #define _TIF_FREEZE (1<<TIF_FREEZE) | ||
151 | 153 | ||
152 | #endif /* __KERNEL__ */ | 154 | #endif /* __KERNEL__ */ |
153 | 155 | ||
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h index c0a737d7292..639ac805448 100644 --- a/arch/sparc/include/asm/thread_info_64.h +++ b/arch/sparc/include/asm/thread_info_64.h | |||
@@ -237,6 +237,7 @@ register struct thread_info *current_thread_info_reg asm("g6"); | |||
237 | #define TIF_ABI_PENDING 12 | 237 | #define TIF_ABI_PENDING 12 |
238 | #define TIF_MEMDIE 13 | 238 | #define TIF_MEMDIE 13 |
239 | #define TIF_POLLING_NRFLAG 14 | 239 | #define TIF_POLLING_NRFLAG 14 |
240 | #define TIF_FREEZE 15 /* is freezing for suspend */ | ||
240 | 241 | ||
241 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 242 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
242 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) | 243 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) |
@@ -249,6 +250,7 @@ register struct thread_info *current_thread_info_reg asm("g6"); | |||
249 | #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) | 250 | #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) |
250 | #define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING) | 251 | #define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING) |
251 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) | 252 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) |
253 | #define _TIF_FREEZE (1<<TIF_FREEZE) | ||
252 | 254 | ||
253 | #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \ | 255 | #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \ |
254 | _TIF_DO_NOTIFY_RESUME_MASK | \ | 256 | _TIF_DO_NOTIFY_RESUME_MASK | \ |
diff --git a/include/asm-cris/thread_info.h b/include/asm-cris/thread_info.h index 7efe1000f99..cee97f14af3 100644 --- a/include/asm-cris/thread_info.h +++ b/include/asm-cris/thread_info.h | |||
@@ -88,6 +88,7 @@ struct thread_info { | |||
88 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ | 88 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ |
89 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 89 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
90 | #define TIF_MEMDIE 17 | 90 | #define TIF_MEMDIE 17 |
91 | #define TIF_FREEZE 18 /* is freezing for suspend */ | ||
91 | 92 | ||
92 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 93 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
93 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) | 94 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) |
@@ -95,6 +96,7 @@ struct thread_info { | |||
95 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) | 96 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) |
96 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) | 97 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) |
97 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) | 98 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) |
99 | #define _TIF_FREEZE (1<<TIF_FREEZE) | ||
98 | 100 | ||
99 | #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ | 101 | #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ |
100 | #define _TIF_ALLWORK_MASK 0x0000FFFF /* work to do on any return to u-space */ | 102 | #define _TIF_ALLWORK_MASK 0x0000FFFF /* work to do on any return to u-space */ |
diff --git a/include/asm-m68k/thread_info.h b/include/asm-m68k/thread_info.h index abc002798a2..af0fda46e94 100644 --- a/include/asm-m68k/thread_info.h +++ b/include/asm-m68k/thread_info.h | |||
@@ -52,5 +52,6 @@ struct thread_info { | |||
52 | #define TIF_DELAYED_TRACE 14 /* single step a syscall */ | 52 | #define TIF_DELAYED_TRACE 14 /* single step a syscall */ |
53 | #define TIF_SYSCALL_TRACE 15 /* syscall trace active */ | 53 | #define TIF_SYSCALL_TRACE 15 /* syscall trace active */ |
54 | #define TIF_MEMDIE 16 | 54 | #define TIF_MEMDIE 16 |
55 | #define TIF_FREEZE 17 /* thread is freezing for suspend */ | ||
55 | 56 | ||
56 | #endif /* _ASM_M68K_THREAD_INFO_H */ | 57 | #endif /* _ASM_M68K_THREAD_INFO_H */ |
diff --git a/include/asm-parisc/thread_info.h b/include/asm-parisc/thread_info.h index 9f812741c35..0407959da48 100644 --- a/include/asm-parisc/thread_info.h +++ b/include/asm-parisc/thread_info.h | |||
@@ -58,6 +58,7 @@ struct thread_info { | |||
58 | #define TIF_32BIT 4 /* 32 bit binary */ | 58 | #define TIF_32BIT 4 /* 32 bit binary */ |
59 | #define TIF_MEMDIE 5 | 59 | #define TIF_MEMDIE 5 |
60 | #define TIF_RESTORE_SIGMASK 6 /* restore saved signal mask */ | 60 | #define TIF_RESTORE_SIGMASK 6 /* restore saved signal mask */ |
61 | #define TIF_FREEZE 7 /* is freezing for suspend */ | ||
61 | 62 | ||
62 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | 63 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) |
63 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | 64 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) |
@@ -65,6 +66,7 @@ struct thread_info { | |||
65 | #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG) | 66 | #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG) |
66 | #define _TIF_32BIT (1 << TIF_32BIT) | 67 | #define _TIF_32BIT (1 << TIF_32BIT) |
67 | #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) | 68 | #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) |
69 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
68 | 70 | ||
69 | #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | \ | 71 | #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | \ |
70 | _TIF_NEED_RESCHED | _TIF_RESTORE_SIGMASK) | 72 | _TIF_NEED_RESCHED | _TIF_RESTORE_SIGMASK) |
diff --git a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h index e07e72846c7..62274ab9471 100644 --- a/include/asm-um/thread_info.h +++ b/include/asm-um/thread_info.h | |||
@@ -69,6 +69,7 @@ static inline struct thread_info *current_thread_info(void) | |||
69 | #define TIF_MEMDIE 5 | 69 | #define TIF_MEMDIE 5 |
70 | #define TIF_SYSCALL_AUDIT 6 | 70 | #define TIF_SYSCALL_AUDIT 6 |
71 | #define TIF_RESTORE_SIGMASK 7 | 71 | #define TIF_RESTORE_SIGMASK 7 |
72 | #define TIF_FREEZE 16 /* is freezing for suspend */ | ||
72 | 73 | ||
73 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | 74 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) |
74 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | 75 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) |
@@ -77,5 +78,6 @@ static inline struct thread_info *current_thread_info(void) | |||
77 | #define _TIF_MEMDIE (1 << TIF_MEMDIE) | 78 | #define _TIF_MEMDIE (1 << TIF_MEMDIE) |
78 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | 79 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) |
79 | #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) | 80 | #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) |
81 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
80 | 82 | ||
81 | #endif | 83 | #endif |
diff --git a/include/asm-xtensa/thread_info.h b/include/asm-xtensa/thread_info.h index 7e4131dd546..0f4fe1faf9b 100644 --- a/include/asm-xtensa/thread_info.h +++ b/include/asm-xtensa/thread_info.h | |||
@@ -134,6 +134,7 @@ static inline struct thread_info *current_thread_info(void) | |||
134 | #define TIF_MEMDIE 5 | 134 | #define TIF_MEMDIE 5 |
135 | #define TIF_RESTORE_SIGMASK 6 /* restore signal mask in do_signal() */ | 135 | #define TIF_RESTORE_SIGMASK 6 /* restore signal mask in do_signal() */ |
136 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 136 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
137 | #define TIF_FREEZE 17 /* is freezing for suspend */ | ||
137 | 138 | ||
138 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 139 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
139 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) | 140 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) |
@@ -142,6 +143,7 @@ static inline struct thread_info *current_thread_info(void) | |||
142 | #define _TIF_IRET (1<<TIF_IRET) | 143 | #define _TIF_IRET (1<<TIF_IRET) |
143 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) | 144 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) |
144 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) | 145 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) |
146 | #define _TIF_FREEZE (1<<TIF_FREEZE) | ||
145 | 147 | ||
146 | #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ | 148 | #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ |
147 | #define _TIF_ALLWORK_MASK 0x0000FFFF /* work to do on any return to u-space */ | 149 | #define _TIF_ALLWORK_MASK 0x0000FFFF /* work to do on any return to u-space */ |