[Linux-mips-commits] CVS: linux/arch/mips/kernel setup.c,1.7,1.8

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv15915

Modified Files:
	setup.c 
Log Message:
Set __rd_start and __rd_end only if we actually have a ramdisk image.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** setup.c	2001/08/17 22:53:26	1.7
--- setup.c	2001/08/23 18:32:33	1.8
***************
*** 743,748 ****
  	/* Board specific code should have set up initrd_start and initrd_end */
  	ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
! 	initrd_start = (unsigned long)&__rd_start;
! 	initrd_end = (unsigned long)&__rd_end;
  	initrd_below_start_ok = 1;
  	if (initrd_start) {
--- 743,750 ----
  	/* Board specific code should have set up initrd_start and initrd_end */
  	ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
! 	if( __rd_start != __rd_end ) {
! 		initrd_start = (unsigned long)&__rd_start;
! 		initrd_end = (unsigned long)&__rd_end;
! 	}
  	initrd_below_start_ok = 1;
  	if (initrd_start) {