From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Oct 2010 15:54:21 +0000 (-0700)
Subject: Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=91151240ed8e97cc4457dae4094153c2744f1eb8;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'x86-irq-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* '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}
---

91151240ed8e97cc4457dae4094153c2744f1eb8
diff --cc include/linux/percpu-defs.h
index 27ef6b190ea6,ab20d119a85d..018db9a62ffe
--- a/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