Merge branch 'master' into for-next

Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes.  As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.

Conflicts:
	arch/alpha/include/asm/percpu.h
	arch/mn10300/kernel/vmlinux.lds.S
	include/linux/percpu-defs.h

1 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index 9b7a53cc16e..aefc2f12b48 100644
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -61,7 +61,8 @@
 #define DEFINE_PER_CPU_SECTION(type, name, sec)                         \
         __PCPU_DUMMY_ATTRS char __pcpu_scope_##name;                    \
         __PCPU_DUMMY_ATTRS char __pcpu_unique_##name;                   \
-        __PCPU_ATTRS(sec) __weak __typeof__(type) per_cpu__##name
+        __PCPU_ATTRS(sec) PER_CPU_DEF_ATTRIBUTES __weak                 \
+        __typeof__(type) per_cpu__##name
 #else
 /*
  * Normal declaration and definition macros.
@@ -70,7 +71,8 @@
         extern __PCPU_ATTRS(sec) __typeof__(type) per_cpu__##name
 
 #define DEFINE_PER_CPU_SECTION(type, name, sec)                         \
-        __PCPU_ATTRS(sec) __typeof__(type) per_cpu__##name
+        __PCPU_ATTRS(sec) PER_CPU_DEF_ATTRIBUTES                        \
+        __typeof__(type) per_cpu__##name
 #endif
 
 /*