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.
Thanks,

	tglx

---

Adrian Bunk (1):

      x86: add instrumentation menu
Alejandro Martinez Ruiz (1):

      x86: ARRAY_SIZE cleanup
Brian Gerst (1):

      x86: merge required-features.h
Carlos Corbacho (2):

      x86: Force enable HPET for CK804 (nForce 4) chipsets

      x86: Add HPET force support for MCP55 (nForce 5) chipsets
Chris Snook (3):

      x86: merge mmu{,_32,_64}.h

      x86: unify a.out{,_32,_64}.h

      x86: unify div64{,_32,_64}.h
Dave Johnson (2):

      x86: fix TSC clock source calibration error

      x86: fix more TSC clock source calibration errors
H. Peter Anvin (1):

      x86: clean up setup.h and the boot code
Hiroshi Shimamoto (3):

      x86: add lapic_shutdown for x86_64

      x86: add safe_smp_processor_id for x86_64

      x86: unify crash_32/64.c
Nick Piggin (1):

      x86: lock bitops
Rafael J. Wysocki (1):

      x86: Save registers in saved_context during suspend and hibernation
Thomas Gleixner (19):

      x86: Add BITS to allow simple Makefile sharing

      x86: merge arch/x86/crypto Makefiles

      x86: Unify arch/x86/kernel/acpi Makefiles

      x86: prepare consolidation of cpu/ related Makefiles

      x86: prepare consolidation of cpu/ related code usage

      x86: consolidate the cpu/ related code usage

      x86: whitespace cleanup of mce_64.c

      x86: merge byteorder_32/64.h

      x86: merge elf_32/64.h

      x86: merge msgbuf_32/64.h

      x86: merge ptrace_32/64.h

      x86: merge shmbuf_32/64.h

      x86: merge stat_32/64.h

      x86: merge statfs_32/64.h

      x86: merge mttr_32/64.h

      x86: merge msr_32/64.h

      x86: merge sigcontext_32/64.h

      x86: merge signal_32/64.h

      x86: merge setup_32/64.h
 Documentation/kernel-parameters.txt             |    3 +-

 arch/i386/Kconfig         ...
[ message continues ]

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

Thanks, it's obviously my mistake.

-

thanks - this is needed for CONFIG_KEXEC builds. Added to the queue.
	Ingo

-

hm, CONFIG_KEXEC builds fine even on 32-bit here - so it must be a

certain combination of .config that triggers this. Could you send me

your .config?
	Ingo

-

Attached.
	-Mike