aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 11:01:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 11:01:28 -0400
commit55e0715f612f19b44c17497929091df2f3357e5d (patch)
tree31e139ebb4fcd98357b3af7af6c4becb41fa9563 /include
parent7dfd54a905be0242bd604557d543c3a2d7b0a540 (diff)
parentbdf977b37418cdf8a2252504779a7e12a09b7575 (diff)
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')
-rw-r--r--include/linux/percpu-defs.h8
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 @@
77/* 77/*
78 * Declaration/definition used for per-CPU variables that must be page aligned. 78 * Declaration/definition used for per-CPU variables that must be page aligned.
79 */ 79 */
80#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ 80#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \
81 DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") 81 DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") \
82 __aligned(PAGE_SIZE)
82 83
83#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ 84#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \
84 DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") 85 DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") \
86 __aligned(PAGE_SIZE)
85 87
86/* 88/*
87 * Intermodule exports for per-CPU variables. 89 * Intermodule exports for per-CPU variables.