patch-1.3.5 linux/arch/i386/kernel/setup.c

• Lines: 25
• Date: Thu Jun 29 11:44:04 1995
• Orig file: v1.3.4/linux/arch/i386/kernel/setup.c
• Orig date: Fri Jun 2 14:21:13 1995

diff -u --recursive --new-file v1.3.4/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -56,7 +56,7 @@
 unsigned char aux_device_present;
 extern int ramdisk_size;
 extern int root_mountflags;
-extern int etext, edata, end;
+extern int _etext, _edata, _end;
 
 extern char empty_zero_page[PAGE_SIZE];
 
@@ -96,11 +96,11 @@
 #endif
 	if (MOUNT_ROOT_RDONLY)
 		root_mountflags |= MS_RDONLY;
-	memory_start = (unsigned long) &end;
+	memory_start = (unsigned long) &_end;
 	init_task.mm->start_code = TASK_SIZE;
-	init_task.mm->end_code = TASK_SIZE + (unsigned long) &etext;
-	init_task.mm->end_data = TASK_SIZE + (unsigned long) &edata;
-	init_task.mm->brk = TASK_SIZE + (unsigned long) &end;
+	init_task.mm->end_code = TASK_SIZE + (unsigned long) &_etext;
+	init_task.mm->end_data = TASK_SIZE + (unsigned long) &_edata;
+	init_task.mm->brk = TASK_SIZE + (unsigned long) &_end;
 
 	for (;;) {
 		if (c == ' ' && *(unsigned long *)from == *(unsigned long *)"mem=") {