diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 09:00:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 09:00:30 -0700 |
| commit | 5c8e191e8437616a498a8e1cc0af3dd0d32bbff2 (patch) | |
| tree | 78ed04467e3bd034eaa9696cdf8d668ba7e16381 /drivers/lguest/lguest.c | |
| parent | cbfee34520666862f8ff539e580c48958fbb7706 (diff) | |
| parent | 3ea335100014785fd2518461705654b200e58d00 (diff) | |
| download | op-kernel-dev-5c8e191e8437616a498a8e1cc0af3dd0d32bbff2.zip op-kernel-dev-5c8e191e8437616a498a8e1cc0af3dd0d32bbff2.tar.gz | |
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 'drivers/lguest/lguest.c')
| -rw-r--r-- | drivers/lguest/lguest.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c index ee1c6d0..4a579c8 100644 --- a/drivers/lguest/lguest.c +++ b/drivers/lguest/lguest.c @@ -893,7 +893,9 @@ static __init char *lguest_memory_setup(void) /* The Linux bootloader header contains an "e820" memory map: the * Launcher populated the first entry with our memory limit. */ - add_memory_region(E820_MAP->addr, E820_MAP->size, E820_MAP->type); + add_memory_region(boot_params.e820_map[0].addr, + boot_params.e820_map[0].size, + boot_params.e820_map[0].type); /* This string is for the boot messages. */ return "LGUEST"; |
