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, 5 insertions, 8 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 395b6974dc8d..8ce10043e4ac 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -34,14 +34,11 @@ static struct {
          * an ongoing cpu hotplug operation.
          */
         int refcount;
-} cpu_hotplug;
-
-void __init cpu_hotplug_init(void)
-{
-        cpu_hotplug.active_writer = NULL;
-        mutex_init(&cpu_hotplug.lock);
-        cpu_hotplug.refcount = 0;
-}
+} cpu_hotplug = {
+        .active_writer = NULL,
+        .lock = __MUTEX_INITIALIZER(cpu_hotplug.lock),
+        .refcount = 0,
+};
 
 #ifdef CONFIG_HOTPLUG_CPU