Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22fa8d59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7f149574 eec407c9

arch/x86/kernel/crash.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/kdebug.h>

#include <linux/kdebug.h>

#include <asm/smp.h>

#include <asm/smp.h>





#ifdef X86_32

#ifdef CONFIG_X86_32

#include <mach_ipi.h>

#include <mach_ipi.h>

#else

#else

#include <asm/mach_apic.h>

#include <asm/mach_apic.h>
@@ -41,7 +41,7 @@ static int crash_nmi_callback(struct notifier_block *self, 
			unsigned long val, void *data)

			unsigned long val, void *data)

{

{

	struct pt_regs *regs;

	struct pt_regs *regs;

#ifdef X86_32

#ifdef CONFIG_X86_32

	struct pt_regs fixed_regs;

	struct pt_regs fixed_regs;

#endif

#endif

	int cpu;

	int cpu;
@@ -60,7 +60,7 @@ static int crash_nmi_callback(struct notifier_block *self, 
		return NOTIFY_STOP;

		return NOTIFY_STOP;

	local_irq_disable();

	local_irq_disable();





#ifdef X86_32

#ifdef CONFIG_X86_32

	if (!user_mode_vm(regs)) {

	if (!user_mode_vm(regs)) {

		crash_fixup_ss_esp(&fixed_regs, regs);

		crash_fixup_ss_esp(&fixed_regs, regs);

		regs = &fixed_regs;

		regs = &fixed_regs;

arch/x86/mm/fault_32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -550,7 +550,7 @@ no_context: 
			page &= PAGE_MASK;

			page &= PAGE_MASK;

			page = ((__typeof__(page) *) __va(page))[(address >> PMD_SHIFT)

			page = ((__typeof__(page) *) __va(page))[(address >> PMD_SHIFT)

			                                         & (PTRS_PER_PMD - 1)];

			                                         & (PTRS_PER_PMD - 1)];

			printk(KERN_ALERT "*pde = %016Lx ", page);

			printk(KERN_CONT "*pde = %016Lx ", page);

			page &= ~_PAGE_NX;

			page &= ~_PAGE_NX;

		}

		}

#else

#else