diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-24 12:41:10 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-24 12:41:10 -0500 |
| commit | 49c6ad430d74fb7995990be0f66165e4b94a6bc5 (patch) | |
| tree | 9a0b4d5158cea625efd1f4185cdea79fe9f10d85 /include/linux/kernel.h | |
| parent | 233d84c46c2253d13e10b42d88c14748fbb67a98 (diff) | |
| parent | 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff) | |
Merge commit 'v2.6.38-rc2' into topic/misc
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, |