diff --git a/[refs] b/[refs] index 6ec01c869ce5..d2c12316d45a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf4bb2b1f285ec56e7f3cbf0190761b42131871c +refs/heads/master: 1a8dd307cc0a2119be4e578c517795464e6dabba diff --git a/trunk/include/linux/percpu-defs.h b/trunk/include/linux/percpu-defs.h index cf32838ad0fa..9b7a53cc16eb 100644 --- a/trunk/include/linux/percpu-defs.h +++ b/trunk/include/linux/percpu-defs.h @@ -56,7 +56,7 @@ */ #define DECLARE_PER_CPU_SECTION(type, name, sec) \ extern __PCPU_DUMMY_ATTRS char __pcpu_scope_##name; \ - extern __PCPU_ATTRS(sec) __weak __typeof__(type) per_cpu__##name + extern __PCPU_ATTRS(sec) __typeof__(type) per_cpu__##name #define DEFINE_PER_CPU_SECTION(type, name, sec) \ __PCPU_DUMMY_ATTRS char __pcpu_scope_##name; \