diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 08:54:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 08:54:21 -0700 |
| commit | 91151240ed8e97cc4457dae4094153c2744f1eb8 (patch) | |
| tree | 201a449a659bcc31cf528f4630b8ec4c49b26f02 /include/linux | |
| parent | 211baf4ffc6e78a2299bb4215264ada313048ec5 (diff) | |
| parent | fe8e0c25cad28e8858ecfa5863333c70685a6811 (diff) | |
| download | kernel_samsung_espresso10-91151240ed8e97cc4457dae4094153c2744f1eb8.zip kernel_samsung_espresso10-91151240ed8e97cc4457dae4094153c2744f1eb8.tar.gz kernel_samsung_espresso10-91151240ed8e97cc4457dae4094153c2744f1eb8.tar.bz2 | |
Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/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}
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/percpu-defs.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 27ef6b1..018db9a 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h @@ -148,6 +148,18 @@ 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 * noop if __CHECKER__. |