Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4244
b: refs/heads/master
c: b6bff39
h: refs/heads/master
v: v3
  • Loading branch information
Michael Ellerman authored and Linus Torvalds committed Jul 8, 2005
1 parent 9ecd421 commit eb65564
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 10ca1e1ed58d6428924b5a44539334c341a6f485
refs/heads/master: b6bff397ea9c36d410212f785ee644103146102a
7 changes: 5 additions & 2 deletions trunk/arch/ppc64/kernel/iSeries_setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -946,9 +946,12 @@ void __init iSeries_early_setup(void)
ppc_md.calibrate_decr = iSeries_calibrate_decr;
ppc_md.progress = iSeries_progress;

if (get_paca()->lppaca.shared_proc)
if (get_paca()->lppaca.shared_proc) {
ppc_md.idle_loop = iseries_shared_idle;
else
printk(KERN_INFO "Using shared processor idle loop\n");
} else {
ppc_md.idle_loop = iseries_dedicated_idle;
printk(KERN_INFO "Using dedicated idle loop\n");
}
}

4 changes: 3 additions & 1 deletion trunk/arch/ppc64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1081,8 +1081,10 @@ void __init setup_arch(char **cmdline_p)
ppc_md.setup_arch();

/* Use the default idle loop if the platform hasn't provided one. */
if (NULL == ppc_md.idle_loop)
if (NULL == ppc_md.idle_loop) {
ppc_md.idle_loop = default_idle;
printk(KERN_INFO "Using default idle loop\n");
}

paging_init();
ppc64_boot_msg(0x15, "Setup Done");
Expand Down

0 comments on commit eb65564

Please sign in to comment.