diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 21:30:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 21:30:37 -0500 |
commit | 2b1caf6ed7b888c95a1909d343799672731651a5 (patch) | |
tree | 7ab9a7ae13bc02376bce6267df67f6f2aa9091f1 /include/linux/kernel.h | |
parent | d551d81d6a720542873f478def60baab6b5df403 (diff) | |
parent | bd924e8cbd4b73ffb7d707a774c04f7e2cae88ed (diff) |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
smp: Allow on_each_cpu() to be called while early_boot_irqs_disabled status to init/main.c
lockdep: Move early boot local IRQ enable/disable status to init/main.c
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5a9d9059520b..d07d8057e440 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -243,6 +243,8 @@ extern int test_taint(unsigned flag); | |||
243 | extern unsigned long get_taint(void); | 243 | extern unsigned long get_taint(void); |
244 | extern int root_mountflags; | 244 | extern int root_mountflags; |
245 | 245 | ||
246 | extern bool early_boot_irqs_disabled; | ||
247 | |||
246 | /* Values used for system_state */ | 248 | /* Values used for system_state */ |
247 | extern enum system_states { | 249 | extern enum system_states { |
248 | SYSTEM_BOOTING, | 250 | SYSTEM_BOOTING, |