Update of /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27
In directory usw-pr-cvs1:/tmp/cvs-serv23204/arch/mips64/sgi-ip27
Modified Files:
ip27-init.c
Log Message:
Most of it was a collection of fixes and cleanups for mips64 and SMP stuff
Index: ip27-init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27/ip27-init.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ip27-init.c 28 Jan 2002 20:31:57 -0000 1.7
+++ ip27-init.c 26 Feb 2002 17:34:15 -0000 1.8
@@ -360,7 +360,6 @@
int cpu = smp_processor_id();
cnodeid_t cnode = get_compact_nodeid();
- current_cpu_data.asid_cache = ASID_FIRST_VERSION;
TLBMISS_HANDLER_SETUP();
#if 0
intr_init();
@@ -423,10 +422,11 @@
static volatile cpumask_t boot_barrier;
-void cboot(void)
+void __init start_secondary(void)
{
CPUMASK_CLRB(boot_barrier, getcpuid()); /* needs atomicity */
per_cpu_init();
+ per_cpu_trap_init();
#if 0
ecc_init();
bte_lateinit();
@@ -443,7 +443,7 @@
int num_cpus = 0;
cpuid_t cpu, mycpuid = getcpuid();
cnodeid_t cnode;
- extern void bootstrap(void);
+ extern void smp_bootstrap(void);
sn_mp_setup();
/* Master has already done per_cpu_init() */
@@ -485,16 +485,16 @@
/* Attach to the address space of init_task. */
atomic_inc(&init_mm.mm_count);
p->active_mm = &init_mm;
-
+
/*
- * Launch a slave into bootstrap().
+ * Launch a slave into smp_bootstrap().
* It doesn't take an argument, and we
* set sp to the kernel stack of the newly
* created idle process, gp to the proc struct
* (so that current-> works).
*/
LAUNCH_SLAVE(cputonasid(num_cpus),cputoslice(num_cpus),
- (launch_proc_t)MAPPED_KERN_RW_TO_K0(bootstrap),
+ (launch_proc_t)MAPPED_KERN_RW_TO_K0(smp_bootstrap),
0, (void *)((unsigned long)p +
KERNEL_STACK_SIZE - 32), (void *)p);
@@ -550,7 +550,10 @@
}
#else /* CONFIG_SMP */
-void cboot(void) {}
+void __init start_secondary(void)
+{
+ /* XXX Why do we need this empty definition at all? */
+}
#endif /* CONFIG_SMP */
|
