aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc64')
-rw-r--r--arch/ppc64/kernel/iSeries_setup.c7
-rw-r--r--arch/ppc64/kernel/setup.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/iSeries_setup.c b/arch/ppc64/kernel/iSeries_setup.c
index 32483dc16d4f..077c82fc9f3a 100644
--- a/arch/ppc64/kernel/iSeries_setup.c
+++ b/arch/ppc64/kernel/iSeries_setup.c
@@ -946,9 +946,12 @@ void __init iSeries_early_setup(void)
946 ppc_md.calibrate_decr = iSeries_calibrate_decr; 946 ppc_md.calibrate_decr = iSeries_calibrate_decr;
947 ppc_md.progress = iSeries_progress; 947 ppc_md.progress = iSeries_progress;
948 948
949 if (get_paca()->lppaca.shared_proc) 949 if (get_paca()->lppaca.shared_proc) {
950 ppc_md.idle_loop = iseries_shared_idle; 950 ppc_md.idle_loop = iseries_shared_idle;
951 else 951 printk(KERN_INFO "Using shared processor idle loop\n");
952 } else {
952 ppc_md.idle_loop = iseries_dedicated_idle; 953 ppc_md.idle_loop = iseries_dedicated_idle;
954 printk(KERN_INFO "Using dedicated idle loop\n");
955 }
953} 956}
954 957
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index a278998ecb44..d1b33f0b26cb 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -1081,8 +1081,10 @@ void __init setup_arch(char **cmdline_p)
1081 ppc_md.setup_arch(); 1081 ppc_md.setup_arch();
1082 1082
1083 /* Use the default idle loop if the platform hasn't provided one. */ 1083 /* Use the default idle loop if the platform hasn't provided one. */
1084 if (NULL == ppc_md.idle_loop) 1084 if (NULL == ppc_md.idle_loop) {
1085 ppc_md.idle_loop = default_idle; 1085 ppc_md.idle_loop = default_idle;
1086 printk(KERN_INFO "Using default idle loop\n");
1087 }
1086 1088
1087 paging_init(); 1089 paging_init();
1088 ppc64_boot_msg(0x15, "Setup Done"); 1090 ppc64_boot_msg(0x15, "Setup Done");