diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 05:02:22 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 05:02:22 -0500 |
| commit | 03b6e6e58d9dd5f3068288653810db3c15fde929 (patch) | |
| tree | b6edb300df2e230230f1f7428ffa54f27b0a040d /kernel | |
| parent | 9e0c20bceb611917a7546172ac617d07e5af0cfa (diff) | |
| parent | 81e88fdc432a1552401d6e91a984dcccce72b8dc (diff) | |
Merge branch 'apei' into release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/panic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 4c13b1a88ebb..991bb87a1704 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
| @@ -34,6 +34,7 @@ static int pause_on_oops_flag; | |||
| 34 | static DEFINE_SPINLOCK(pause_on_oops_lock); | 34 | static DEFINE_SPINLOCK(pause_on_oops_lock); |
| 35 | 35 | ||
| 36 | int panic_timeout; | 36 | int panic_timeout; |
| 37 | EXPORT_SYMBOL_GPL(panic_timeout); | ||
| 37 | 38 | ||
| 38 | ATOMIC_NOTIFIER_HEAD(panic_notifier_list); | 39 | ATOMIC_NOTIFIER_HEAD(panic_notifier_list); |
| 39 | 40 | ||