1 files changed, 4 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 02fed27af7f6..4271f7a655a3 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -24,7 +24,6 @@
 #include <linux/seq_file.h>
 #include <linux/ioport.h>
 #include <linux/console.h>
-#include <linux/utsname.h>
 #include <linux/screen_info.h>
 #include <linux/root_dev.h>
 #include <linux/notifier.h>
@@ -328,7 +327,7 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 
-struct seq_operations cpuinfo_op = {
+const struct seq_operations cpuinfo_op = {
         .start =c_start,
         .next = c_next,
         .stop = c_stop,
@@ -432,9 +431,9 @@ void __init smp_setup_cpu_maps(void)
                 for (j = 0; j < nthreads && cpu < NR_CPUS; j++) {
                         DBG("    thread %d -> cpu %d (hard id %d)\n",
                             j, cpu, intserv[j]);
-                        cpu_set(cpu, cpu_present_map);
+                        set_cpu_present(cpu, true);
                         set_hard_smp_processor_id(cpu, intserv[j]);
-                        cpu_set(cpu, cpu_possible_map);
+                        set_cpu_possible(cpu, true);
                         cpu++;
                 }
         }
@@ -480,7 +479,7 @@ void __init smp_setup_cpu_maps(void)
                                maxcpus);
 
                 for (cpu = 0; cpu < maxcpus; cpu++)
-                        cpu_set(cpu, cpu_possible_map);
+                        set_cpu_possible(cpu, true);
         out:
                 of_node_put(dn);
         }