diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-08 11:41:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-08 11:41:50 -0400 |
| commit | b6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (patch) | |
| tree | 14e6031e0efa8e8b684db3b7ff85f8ac63ed0824 /include/linux/kernel.h | |
| parent | bafcdd3b6cb86035cdb0511450961edcdc084c27 (diff) | |
| parent | 7a0c819d28f5c91955854e048766d6afef7c8a3d (diff) | |
Merge tag 'please-pull-cmci_rediscover' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull clean up of the cmci_rediscover code to fix problems found by Dave Jones,
from Tony Luck.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 80d36874689b..79fdd80a42d4 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -390,7 +390,6 @@ extern struct pid *session_of_pgrp(struct pid *pgrp); | |||
| 390 | unsigned long int_sqrt(unsigned long); | 390 | unsigned long int_sqrt(unsigned long); |
| 391 | 391 | ||
| 392 | extern void bust_spinlocks(int yes); | 392 | extern void bust_spinlocks(int yes); |
| 393 | extern void wake_up_klogd(void); | ||
| 394 | extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ | 393 | extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ |
| 395 | extern int panic_timeout; | 394 | extern int panic_timeout; |
| 396 | extern int panic_on_oops; | 395 | extern int panic_on_oops; |
