Merge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[linux-2.6-omap-h63xx.git] / arch / x86 / xen / enlighten.c

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index c89e5b407f908f2f00d9b2f966b58a87f7b9e4b8..94c39aaf695facf3d3937633306bb7e5b17d41fd 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1188,9 +1188,10 @@ asmlinkage void __init xen_start_kernel(void)
        new_cpu_data.x86_capability[0] = cpuid_edx(1);
 
        /* Poke various useful things into boot_params */
-       LOADER_TYPE = (9 << 4) | 0;
-       INITRD_START = xen_start_info->mod_start ? __pa(xen_start_info->mod_start) : 0;
-       INITRD_SIZE = xen_start_info->mod_len;
+       boot_params.hdr.type_of_loader = (9 << 4) | 0;
+       boot_params.hdr.ramdisk_image = xen_start_info->mod_start
+               ? __pa(xen_start_info->mod_start) : 0;
+       boot_params.hdr.ramdisk_size = xen_start_info->mod_len;
 
        /* Start the world */
        start_kernel();