ia64/xen-unstable

changeset 3752:0e59227addd8

bitkeeper revision 1.1159.1.558 (42097caa-4C6IJxUdk1DgyyzixbYBg)

Merge tetris.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into tetris.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author iap10@tetris.cl.cam.ac.uk
date Wed Feb 09 02:59:54 2005 +0000 (2005-02-09)
parents 7e23d55c92a3 4b38851f1bd1
children 0d53bdb43b1c
files linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c
line diff
     1.1 --- a/linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c	Wed Feb 09 00:02:37 2005 +0000
     1.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c	Wed Feb 09 02:59:54 2005 +0000
     1.3 @@ -240,7 +240,9 @@ void __init setup_arch(char **cmdline_p)
     1.4      boot_cpu_data.pgd_quick = cpu0_pgd_quicklist;
     1.5      boot_cpu_data.pte_quick = cpu0_pte_quicklist;
     1.6  
     1.7 -    ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
     1.8 +    /* This must be initialized to UNNAMED_MAJOR for ipconfig to work
     1.9 +       properly.  Setting ROOT_DEV to default to /dev/ram0 breaks initrd. */
    1.10 +    ROOT_DEV = MKDEV(UNNAMED_MAJOR,0);
    1.11      memset(&drive_info, 0, sizeof(drive_info));
    1.12      memset(&screen_info, 0, sizeof(screen_info));
    1.13      
     2.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c	Wed Feb 09 00:02:37 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c	Wed Feb 09 02:59:54 2005 +0000
     2.3 @@ -1360,7 +1360,10 @@ void __init setup_arch(char **cmdline_p)
     2.4  		efi_enabled = 1;
     2.5  #endif
     2.6  
     2.7 - 	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0); /*old_decode_dev(ORIG_ROOT_DEV);*/
     2.8 +	/* This must be initialized to UNNAMED_MAJOR for ipconfig to work
     2.9 +	   properly.  Setting ROOT_DEV to default to /dev/ram0 breaks initrd.
    2.10 +	*/
    2.11 +	ROOT_DEV = MKDEV(UNNAMED_MAJOR,0);
    2.12   	drive_info = DRIVE_INFO;
    2.13   	screen_info = SCREEN_INFO;
    2.14  	edid_info = EDID_INFO;