diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:00:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:00:30 -0400 |
| commit | 5c8e191e8437616a498a8e1cc0af3dd0d32bbff2 (patch) | |
| tree | 78ed04467e3bd034eaa9696cdf8d668ba7e16381 /arch/x86/xen/enlighten.c | |
| parent | cbfee34520666862f8ff539e580c48958fbb7706 (diff) | |
| parent | 3ea335100014785fd2518461705654b200e58d00 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
Remove magic macros for screen_info structure members
[x86] remove uses of magic macros for boot_params access
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index f01bfcd4bde..493a083f688 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
| @@ -1137,9 +1137,10 @@ asmlinkage void __init xen_start_kernel(void) | |||
| 1137 | new_cpu_data.x86_capability[0] = cpuid_edx(1); | 1137 | new_cpu_data.x86_capability[0] = cpuid_edx(1); |
| 1138 | 1138 | ||
| 1139 | /* Poke various useful things into boot_params */ | 1139 | /* Poke various useful things into boot_params */ |
| 1140 | LOADER_TYPE = (9 << 4) | 0; | 1140 | boot_params.hdr.type_of_loader = (9 << 4) | 0; |
| 1141 | INITRD_START = xen_start_info->mod_start ? __pa(xen_start_info->mod_start) : 0; | 1141 | boot_params.hdr.ramdisk_image = xen_start_info->mod_start |
| 1142 | INITRD_SIZE = xen_start_info->mod_len; | 1142 | ? __pa(xen_start_info->mod_start) : 0; |
| 1143 | boot_params.hdr.ramdisk_size = xen_start_info->mod_len; | ||
| 1143 | 1144 | ||
| 1144 | /* Start the world */ | 1145 | /* Start the world */ |
| 1145 | start_kernel(); | 1146 | start_kernel(); |