Update of /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27
In directory usw-pr-cvs1:/tmp/cvs-serv20204/arch/mips64/sgi-ip27
Modified Files:
ip27-init.c ip27-timer.c
Log Message:
Sync with OSS (except for sysmips, which is waiting to be tested first).
Index: ip27-init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27/ip27-init.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ip27-init.c 2001/10/22 19:16:45 1.2
+++ ip27-init.c 2001/10/27 17:28:54 1.3
@@ -364,7 +364,7 @@
#if 0
intr_init();
#endif
- set_cp0_status(ST0_IM, 0);
+ clear_cp0_status(ST0_IM);
per_hub_init(cnode);
cpu_time_init();
if (smp_processor_id()) /* master can't do this early, no kmalloc */
@@ -374,12 +374,12 @@
#if 0
install_tlbintr(cpu);
#endif
- set_cp0_status(SRB_DEV0 | SRB_DEV1, SRB_DEV0 | SRB_DEV1);
+ set_cp0_status(SRB_DEV0 | SRB_DEV1);
if (is_slave) {
- set_cp0_status(ST0_BEV, 0);
+ clear_cp0_status(ST0_BEV);
if (mips4_available)
- set_cp0_status(ST0_XX, ST0_XX);
- set_cp0_status(ST0_KX|ST0_SX|ST0_UX, ST0_KX|ST0_SX|ST0_UX);
+ set_cp0_status(ST0_XX);
+ set_cp0_status(ST0_KX|ST0_SX|ST0_UX);
sti();
load_mmu();
atomic_inc(&numstarted);
Index: ip27-timer.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27/ip27-timer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ip27-timer.c 2001/10/11 19:19:52 1.2
+++ ip27-timer.c 2001/10/27 17:28:54 1.3
@@ -253,7 +253,7 @@
printk("CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed);
- set_cp0_status(SRB_TIMOCLK, SRB_TIMOCLK);
+ set_cp0_status(SRB_TIMOCLK);
}
void __init hub_rtc_init(cnodeid_t cnode)
|
