summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-24 09:48:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-24 09:48:43 -0800
commitf6398600f92b738813e34a1b576ac1cb895e43a1 (patch)
tree554f1f1959d5fe78b532f6742c44c4fe85843379 /include
parent4b69316ededd0d2db309c7eca3858144c05fe8c1 (diff)
parentb1a0fbfdde65dffd83c84c006f84fa12041907c5 (diff)
downloadlinux-f6398600f92b738813e34a1b576ac1cb895e43a1.tar.bz2
Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu fix from Tejun Heo: "A single commit to fix a spurious sparse warning coming from DEFINE_PER_CPU()'s hack to support the use of weak symbols. Shouldn't cause observable behavior change" * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: fix spurious sparse warnings from DEFINE_PER_CPU()
Diffstat (limited to 'include')
-rw-r--r--include/linux/percpu-defs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index 57e890abe1f0..a5fc7d01aad6 100644
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -69,6 +69,7 @@
__PCPU_DUMMY_ATTRS char __pcpu_scope_##name; \
extern __PCPU_DUMMY_ATTRS char __pcpu_unique_##name; \
__PCPU_DUMMY_ATTRS char __pcpu_unique_##name; \
+ extern __PCPU_ATTRS(sec) __typeof__(type) name; \
__PCPU_ATTRS(sec) PER_CPU_DEF_ATTRIBUTES __weak \
__typeof__(type) name
#else