lkml.org 
[lkml]   [2007]   [Oct]   [24]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[patchlet] Re: [Git pull] x86 updates
    FromMike Galbraith <>
    DateWed, 24 Oct 2007 06:32:35 +0200
    On Tue, 2007-10-23 at 23:02 +0200, Thomas Gleixner wrote:
    > Linus, 
    > 
    > please pull from:
    > 
    >   ssh://master.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
    > 
    > This contains a couple of bug fixes and a large cleanup and
    > unification section from various authors.
    
    X86_32 build fix to commit 62a31a03b3d2a9d20e7a073e2cd9b27bfb7d6a3f
    
    Signed-off-by: Mike Galbraith <efault@gmx.de>
    
    diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
    index af0253f..8bb482f 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;
    
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at  http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at  http://www.tux.org/lkml/
    
    
    \
     
     \ /
      Last update: 2007-10-24 06:35    [from the cache]
    ©2003-2008