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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  percpu: Remove the multi-page alignment facility
  x86-32: Allocate irq stacks seperate from percpu area
  x86-32, mm: Remove duplicated #include
  x86, printk: Get rid of <0> from stack output
  x86, kexec: Make sure to stop all CPUs before exiting the kernel
  x86/vsmp: Eliminate kconfig dependency warning
This commit is contained in:
Linus Torvalds 2010-10-27 18:38:55 -07:00
commit 0671b7674f
12 changed files with 31 additions and 45 deletions

View file

@ -147,18 +147,6 @@
#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