forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* '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}
This commit is contained in:
Linus Torvalds 2010-10-22 08:54:21 -07:00
commit 91151240ed
8 changed files with 25 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/linux/percpu-defs.h
View file

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