patch-2.0.11 linux/arch/alpha/boot/main.c

• Lines: 52
• Date: Sun Aug 4 13:37:59 1996
• Orig file: v2.0.10/linux/arch/alpha/boot/main.c
• Orig date: Wed May 15 10:49:36 1996

diff -u --recursive --new-file v2.0.10/linux/arch/alpha/boot/main.c linux/arch/alpha/boot/main.c
@@ -17,6 +17,8 @@
 
 #include <stdarg.h>
 
+#include "ksize.h"
+
 extern int vsprintf(char *, const char *, va_list);
 extern unsigned long switch_to_osf_pal(unsigned long nr,
 	struct pcb_struct * pcb_va, struct pcb_struct * pcb_pa,
@@ -152,8 +154,6 @@
 	flush_tlb_all();
 }
 
-extern int _end;
-
 static inline long openboot(void)
 {
 	char bootdev[256];
@@ -173,7 +173,8 @@
 static inline long load(long dev, unsigned long addr, unsigned long count)
 {
 	char bootfile[256];
-	long result;
+	extern char _end;
+	long result, boot_size = &_end - (char *) BOOT_ADDR;
 
 	result = dispatch(CCB_GET_ENV, ENV_BOOTED_FILE, bootfile, 255);
 	if (result < 0)
@@ -181,8 +182,9 @@
 	result &= 255;
 	bootfile[result] = '\0';
 	if (result)
-		printk("Boot file specification (%s) not implemented\n", bootfile);
-	return dispatch(CCB_READ, dev, count, addr, BOOT_SIZE/512 + 1);
+		printk("Boot file specification (%s) not implemented\n",
+		       bootfile);
+	return dispatch(CCB_READ, dev, count, addr, boot_size/512 + 1);
 }
 
 /*
@@ -219,9 +221,9 @@
 	}
 	dev &= 0xffffffff;
 	printk("Loading vmlinux ...");
-	i = load(dev, START_ADDR, START_SIZE);
+	i = load(dev, START_ADDR, KERNEL_SIZE);
 	close(dev);
-	if (i != START_SIZE) {
+	if (i != KERNEL_SIZE) {
 		printk("Failed (%lx)\n", i);
 		return;
 	}