diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:38:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:38:55 -0400 |
| commit | 0671b7674f42ab3a200401ea0e48d6f47d34acae (patch) | |
| tree | a35d3347e927dfe621f42ff82289f61f45564393 /include | |
| parent | 0b2d8d9e562de3ee2476f549549e4fefbb7a4213 (diff) | |
| parent | 47f19a0814e80e1d4e5c17d61b70fca85ea09162 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/percpu-defs.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 018db9a62ffe..27ef6b190ea6 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h | |||
| @@ -148,18 +148,6 @@ | |||
| 148 | DEFINE_PER_CPU_SECTION(type, name, "..readmostly") | 148 | DEFINE_PER_CPU_SECTION(type, name, "..readmostly") |
| 149 | 149 | ||
| 150 | /* | 150 | /* |
| 151 | * Declaration/definition used for large per-CPU variables that must be | ||
| 152 | * aligned to something larger than the pagesize. | ||
| 153 | */ | ||
| 154 | #define DECLARE_PER_CPU_MULTIPAGE_ALIGNED(type, name, size) \ | ||
| 155 | DECLARE_PER_CPU_SECTION(type, name, "..page_aligned") \ | ||
| 156 | __aligned(size) | ||
| 157 | |||
| 158 | #define DEFINE_PER_CPU_MULTIPAGE_ALIGNED(type, name, size) \ | ||
| 159 | DEFINE_PER_CPU_SECTION(type, name, "..page_aligned") \ | ||
| 160 | __aligned(size) | ||
| 161 | |||
| 162 | /* | ||
| 163 | * Intermodule exports for per-CPU variables. sparse forgets about | 151 | * Intermodule exports for per-CPU variables. sparse forgets about |
| 164 | * address space across EXPORT_SYMBOL(), change EXPORT_SYMBOL() to | 152 | * address space across EXPORT_SYMBOL(), change EXPORT_SYMBOL() to |
| 165 | * noop if __CHECKER__. | 153 | * noop if __CHECKER__. |