Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging

possible.  Chainsawed RM200 kernel to compile again.  Jazz machine
status unknown.

2 files changed, 16 insertions, 19 deletions

diff --git a/arch/alpha/boot/bootp.c b/arch/alpha/boot/bootp.c
index bb892ba3c..3be5fd6b6 100644
--- a/arch/alpha/boot/bootp.c
+++ b/arch/alpha/boot/bootp.c
@@ -93,7 +93,7 @@ pal_init(void)
 	i = switch_to_osf_pal(2, pcb_va, pcb_pa, VPTB);
 	if (i) {
 		srm_printk("failed, code %ld\n", i);
-		halt();
+		__halt();
 	}
 
 	percpu = (struct percpu_struct *)
@@ -171,8 +171,7 @@ start_kernel(void)
 	srm_printk("Initrd positioned at %#lx\n", initrd_start);
 #endif
 
-	nbytes = srm_dispatch(CCB_GET_ENV, ENV_BOOTED_OSFLAGS,
-			      envval, sizeof(envval));
+	nbytes = callback_getenv(ENV_BOOTED_OSFLAGS, envval, sizeof(envval));
 	if (nbytes < 0 || nbytes >= sizeof(envval)) {
 		nbytes = 0;
 	}
@@ -181,18 +180,17 @@ start_kernel(void)
 
 	/* NOTE: *no* callbacks or printouts from here on out!!! */
 
-	/*
-	 * This is a hack, as some consoles seem to get virtual 20000000
-	 * (ie where the SRM console puts the kernel bootp image) memory
-	 * overlapping physical 310000 memory, which causes real problems
-	 * when attempting to copy the former to the latter... :-(
+	/* This is a hack, as some consoles seem to get virtual 20000000 (ie
+	 * where the SRM console puts the kernel bootp image) memory
+	 * overlapping physical memory where the kernel wants to be put,
+	 * which causes real problems when attempting to copy the former to
+	 * the latter... :-(
 	 *
 	 * So, we first move the kernel virtual-to-physical way above where
 	 * we physically want the kernel to end up, then copy it from there
 	 * to its final resting place... ;-}
 	 *
-	 * Sigh...
-	 */
+	 * Sigh...  */
 
 #ifdef INITRD_SIZE
 	load(initrd_start, KERNEL_ORIGIN+KERNEL_SIZE, INITRD_SIZE);
diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c
index 07913d899..78c9b0b6e 100644
--- a/arch/alpha/boot/main.c
+++ b/arch/alpha/boot/main.c
@@ -90,7 +90,7 @@ pal_init(void)
 	i = switch_to_osf_pal(2, pcb_va, pcb_pa, VPTB);
 	if (i) {
 		srm_printk("failed, code %ld\n", i);
-		halt();
+		__halt();
 	}
 
 	percpu = (struct percpu_struct *)
@@ -107,15 +107,15 @@ static inline long openboot(void)
 	char bootdev[256];
 	long result;
 
-	result = srm_dispatch(CCB_GET_ENV, ENV_BOOTED_DEV, bootdev, 255);
+	result = callback_getenv(ENV_BOOTED_DEV, bootdev, 255);
 	if (result < 0)
 		return result;
-	return srm_dispatch(CCB_OPEN, bootdev, result & 255);
+	return callback_open(bootdev, result & 255);
 }
 
 static inline long close(long dev)
 {
-	return srm_dispatch(CCB_CLOSE, dev);
+	return callback_close(dev);
 }
 
 static inline long load(long dev, unsigned long addr, unsigned long count)
@@ -124,7 +124,7 @@ static inline long load(long dev, unsigned long addr, unsigned long count)
 	extern char _end;
 	long result, boot_size = &_end - (char *) BOOT_ADDR;
 
-	result = srm_dispatch(CCB_GET_ENV, ENV_BOOTED_FILE, bootfile, 255);
+	result = callback_getenv(ENV_BOOTED_FILE, bootfile, 255);
 	if (result < 0)
 		return result;
 	result &= 255;
@@ -132,7 +132,7 @@ static inline long load(long dev, unsigned long addr, unsigned long count)
 	if (result)
 		srm_printk("Boot file specification (%s) not implemented\n",
 		       bootfile);
-	return srm_dispatch(CCB_READ, dev, count, addr, boot_size/512 + 1);
+	return callback_read(dev, count, addr, boot_size/512 + 1);
 }
 
 /*
@@ -176,8 +176,7 @@ void start_kernel(void)
 		return;
 	}
 
-	nbytes = srm_dispatch(CCB_GET_ENV, ENV_BOOTED_OSFLAGS,
-			  envval, sizeof(envval));
+	nbytes = callback_getenv(ENV_BOOTED_OSFLAGS, envval, sizeof(envval));
 	if (nbytes < 0) {
 		nbytes = 0;
 	}
@@ -188,5 +187,5 @@ void start_kernel(void)
 	runkernel();
 	for (i = 0 ; i < 0x100000000 ; i++)
 		/* nothing */;
-	halt();
+	__halt();
 }