hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2007-10-25 15:48:05 -07:00
parent 7f14957453 eec407c9ac
commit 22fa8d59be
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/crash.c
View File

@ -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;

2
arch/x86/mm/fault_32.c
View File

@ -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