diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 19:01:28 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 19:01:28 +0400 |
| commit | 55e0715f612f19b44c17497929091df2f3357e5d (patch) | |
| tree | 31e139ebb4fcd98357b3af7af6c4becb41fa9563 /include/linux | |
| parent | 7dfd54a905be0242bd604557d543c3a2d7b0a540 (diff) | |
| parent | bdf977b37418cdf8a2252504779a7e12a09b7575 (diff) | |
| download | linux-55e0715f612f19b44c17497929091df2f3357e5d.tar.xz | |
Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, percpu: Collect hot percpu variables into one cacheline
x86, percpu: Fix DECLARE/DEFINE_PER_CPU_PAGE_ALIGNED()
x86, percpu: Add 'percpu_read_stable()' interface for cacheable accesses
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/percpu-defs.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 3058cf9dd3d4..0761491b3eec 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h @@ -77,11 +77,13 @@ /* * Declaration/definition used for per-CPU variables that must be page aligned. */ -#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ - DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") +#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ + DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") \ + __aligned(PAGE_SIZE) #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ - DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") + DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") \ + __aligned(PAGE_SIZE) /* * Intermodule exports for per-CPU variables. |