diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2008-09-15 01:03:16 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2008-09-15 01:03:16 +0000 |
| commit | cadd87749dc74a8e56ad741188d6740e121db7a4 (patch) | |
| tree | 0fbf0d4826cd7280c1a143599bd28eb7b5e8570f /sys/powerpc | |
| parent | 12028e919b0c09952fee9d63cdad543210f717fa (diff) | |
Notes
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/aim/mp_cpudep.c | 2 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/autoconf.c | 5 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/mp_machdep.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c index 5b867dd6ab3b..cd50755ac8fb 100644 --- a/sys/powerpc/aim/mp_cpudep.c +++ b/sys/powerpc/aim/mp_cpudep.c @@ -169,7 +169,7 @@ cpudep_ap_bootstrap(volatile uint32_t *trcp) trcp[0] = 0x2003; trcp[1] = hid; - msr = PSL_IR | PSL_DR | PSL_ME; + msr = PSL_IR | PSL_DR | PSL_ME | PSL_RI; mtmsr(msr); isync(); diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c index acf1325ab01c..374932156059 100644 --- a/sys/powerpc/powerpc/autoconf.c +++ b/sys/powerpc/powerpc/autoconf.c @@ -75,11 +75,8 @@ configure_final(void *dummy) powerpc_enable_intr(); /* Enable external interrupts. */ -#if defined(AIM) - mtmsr(mfmsr() | PSL_EE | PSL_RI); -#elif defined(E500) mtmsr(mfmsr() | PSL_EE); -#endif + cninit_finish(); cold = 0; } diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c index c21f9db511be..f21851b56cea 100644 --- a/sys/powerpc/powerpc/mp_machdep.c +++ b/sys/powerpc/powerpc/mp_machdep.c @@ -72,7 +72,7 @@ machdep_ap_bootstrap(volatile uint32_t *trcp) /* Initialize curthread. */ PCPU_SET(curthread, PCPU_GET(idlethread)); - mtmsr(mfmsr() | PSL_EE | PSL_RI); + mtmsr(mfmsr() | PSL_EE); sched_throw(NULL); } |