diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 15:48:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-25 15:48:05 -0700 |
| commit | 22fa8d59be28affbecc6ae87abf528aebeebff24 (patch) | |
| tree | 1aba231d9d1dc41670183241ff04f22ae8ac5037 /arch | |
| parent | 7f1495745347bc2cb9cc4f50d0a889caeb71f1f1 (diff) | |
| parent | eec407c9ac5ee819bfcadb4e39ce892576d570d1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix bogus KERN_ALERT on oops
x86: lguest build fix
x86: fix CONFIG_KEXEC build breakage
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/crash.c | 6 | ||||
| -rw-r--r-- | arch/x86/mm/fault_32.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index af0253f94a9..8bb482ff091 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -25,7 +25,7 @@ #include <linux/kdebug.h> #include <asm/smp.h> -#ifdef X86_32 +#ifdef CONFIG_X86_32 #include <mach_ipi.h> #else #include <asm/mach_apic.h> @@ -41,7 +41,7 @@ static int crash_nmi_callback(struct notifier_block *self, unsigned long val, void *data) { struct pt_regs *regs; -#ifdef X86_32 +#ifdef CONFIG_X86_32 struct pt_regs fixed_regs; #endif int cpu; @@ -60,7 +60,7 @@ static int crash_nmi_callback(struct notifier_block *self, return NOTIFY_STOP; local_irq_disable(); -#ifdef X86_32 +#ifdef CONFIG_X86_32 if (!user_mode_vm(regs)) { crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index 503dfc05111..33563ee8eb0 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c @@ -550,7 +550,7 @@ no_context: page &= PAGE_MASK; page = ((__typeof__(page) *) __va(page))[(address >> PMD_SHIFT) & (PTRS_PER_PMD - 1)]; - printk(KERN_ALERT "*pde = %016Lx ", page); + printk(KERN_CONT "*pde = %016Lx ", page); page &= ~_PAGE_NX; } #else |