Merge branch 'percpu-for-linus' into percpu-for-next

Conflicts:
	arch/sparc/kernel/smp_64.c
	arch/x86/kernel/cpu/perf_counter.c
	arch/x86/kernel/setup_percpu.c
	drivers/cpufreq/cpufreq_ondemand.c
	mm/percpu.c

Conflicts in core and arch percpu codes are mostly from commit
ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
num_possible_cpus() with nr_cpu_ids.  As for-next branch has moved all
the first chunk allocators into mm/percpu.c, the changes are moved
from arch code to mm/percpu.c.

Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 9 insertions, 6 deletions

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index b8bf4b140065..371a2d88f4ac 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -70,6 +70,7 @@ struct shutdown_action {
         char *name;
         void (*fn) (struct shutdown_trigger *trigger);
         int (*init) (void);
+        int init_rc;
 };
 
 static char *ipl_type_str(enum ipl_type type)
@@ -1486,11 +1487,13 @@ static int set_trigger(const char *buf, struct shutdown_trigger *trigger,
         int i;
 
         for (i = 0; i < SHUTDOWN_ACTIONS_COUNT; i++) {
-                if (!shutdown_actions_list[i])
-                        continue;
                 if (sysfs_streq(buf, shutdown_actions_list[i]->name)) {
-                        trigger->action = shutdown_actions_list[i];
-                        return len;
+                        if (shutdown_actions_list[i]->init_rc) {
+                                return shutdown_actions_list[i]->init_rc;
+                        } else {
+                                trigger->action = shutdown_actions_list[i];
+                                return len;
+                        }
                 }
         }
         return -EINVAL;
@@ -1640,8 +1643,8 @@ static void __init shutdown_actions_init(void)
         for (i = 0; i < SHUTDOWN_ACTIONS_COUNT; i++) {
                 if (!shutdown_actions_list[i]->init)
                         continue;
-                if (shutdown_actions_list[i]->init())
-                        shutdown_actions_list[i] = NULL;
+                shutdown_actions_list[i]->init_rc =
+                        shutdown_actions_list[i]->init();
         }
 }