diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-12 07:22:22 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-12 07:22:28 -0500 |
| commit | cfe08bba1e0017d94a8f738a195d3a2b479327e3 (patch) | |
| tree | 4546939fd9fbddc978b6eaa0299b03177e9e643b /include/linux/freezer.h | |
| parent | 58bff947e2d164c7e5cbf7f485e4b3d4884befeb (diff) | |
| parent | abb0052289e58140d933b29491f59e4be0a19727 (diff) | |
Merge branch 'x86/apic' into x86/irq
Reason: Update to latest genirq code conflicts with pending apic
changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/freezer.h')
| -rw-r--r-- | include/linux/freezer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/freezer.h b/include/linux/freezer.h index da7e52b099f3..1effc8b56b4e 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h | |||
| @@ -109,7 +109,7 @@ static inline void freezer_count(void) | |||
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | /* | 111 | /* |
| 112 | * Check if the task should be counted as freezeable by the freezer | 112 | * Check if the task should be counted as freezable by the freezer |
| 113 | */ | 113 | */ |
| 114 | static inline int freezer_should_skip(struct task_struct *p) | 114 | static inline int freezer_should_skip(struct task_struct *p) |
| 115 | { | 115 | { |