diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/panic.c | 2 | ||||
| -rw-r--r-- | kernel/platform.c | 7 | ||||
| -rw-r--r-- | kernel/pm.c | 2 | ||||
| -rw-r--r-- | kernel/printk.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 84adabf00cf5..5281e7cce9f8 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -66,7 +66,7 @@ NORET_TYPE void panic(const char * fmt, ...) smp_send_stop(); #endif - notifier_call_chain(&panic_notifier_list, 0, NULL); + notifier_call_chain(&panic_notifier_list, 0, buf); if (panic_timeout > 0) { diff --git a/kernel/platform.c b/kernel/platform.c index 2d786dcb77c3..9848541526a6 100644 --- a/kernel/platform.c +++ b/kernel/platform.c @@ -6,10 +6,6 @@ #include <linux/module.h> #include <linux/errno.h> -static struct platform_t default_platform; - -struct platform_t * platform = &default_platform; -static spinlock_t platform_lock = SPIN_LOCK_UNLOCKED; void default_reboot(char * cmd) { @@ -36,6 +32,9 @@ static struct platform_t default_platform = { idle: default_idle, }; +struct platform_t * platform = &default_platform; +static spinlock_t platform_lock = SPIN_LOCK_UNLOCKED; + /** * set_platform_driver - set the platform driver. * @pf: driver to set it to diff --git a/kernel/pm.c b/kernel/pm.c index 0992b66f0d4b..fe5296045ec9 100644 --- a/kernel/pm.c +++ b/kernel/pm.c @@ -31,7 +31,7 @@ int pm_active; * Locking notes: * pm_devs_lock can be a semaphore providing pm ops are not called * from an interrupt handler (already a bad idea so no change here). Each - * change must be protected so that an unlink of an entry doesnt clash + * change must be protected so that an unlink of an entry doesn't clash * with a pm send - which is permitted to sleep in the current architecture * * Module unloads clashing with pm events now work out safely, the module diff --git a/kernel/printk.c b/kernel/printk.c index d095aac9fb57..f86862435f2e 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -31,6 +31,8 @@ #if defined(CONFIG_MULTIQUAD) || defined(CONFIG_IA64) #define LOG_BUF_LEN (65536) +#elif defined(CONFIG_ARCH_S390) +#define LOG_BUF_LEN (131072) #elif defined(CONFIG_SMP) #define LOG_BUF_LEN (32768) #else |