Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE
  x86: Move alloc_desk_mask variables inside ifdef
  x86-32: Align IRQ stacks properly
  x86: Remove CONFIG_4KSTACKS
  x86: Always use irq stacks

Fixed up trivial conflicts in include/linux/{irq.h, percpu-defs.h}

diff --cc arch/x86/Kconfig.debug
Simple merge

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge

diff --cc include/linux/percpu-defs.h
index 27ef6b190ea6cc5ee84c53dbcd9a38f5c09164d6,ab20d119a85d6eb031b2fdbf0ff919f03307330c..018db9a62ffe7b08ea64a967ab0b0a0a5caedf44
--- 1/include/linux/percpu-defs.h
--- 2/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@@ -138,15 -138,18 +138,27 @@@
        DEFINE_PER_CPU_SECTION(type, name, "..page_aligned")            \
        __aligned(PAGE_SIZE)
  
 +/*
 + * Declaration/definition used for per-CPU variables that must be read mostly.
 + */
 +#define DECLARE_PER_CPU_READ_MOSTLY(type, name)                       \
 +      DECLARE_PER_CPU_SECTION(type, name, "..readmostly")
 +
 +#define DEFINE_PER_CPU_READ_MOSTLY(type, name)                                \
 +      DEFINE_PER_CPU_SECTION(type, name, "..readmostly")
 +
+ /*
+  * Declaration/definition used for large per-CPU variables that must be
+  * aligned to something larger than the pagesize.
+  */
+ #define DECLARE_PER_CPU_MULTIPAGE_ALIGNED(type, name, size)           \
+       DECLARE_PER_CPU_SECTION(type, name, "..page_aligned")           \
+       __aligned(size)
+ 
+ #define DEFINE_PER_CPU_MULTIPAGE_ALIGNED(type, name, size)            \
+       DEFINE_PER_CPU_SECTION(type, name, "..page_aligned")            \
+       __aligned(size)
+ 
  /*
   * Intermodule exports for per-CPU variables.  sparse forgets about
   * address space across EXPORT_SYMBOL(), change EXPORT_SYMBOL() to