diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:44:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:44:17 -0500 |
| commit | f333b3f111e9db76109e304df8ee777ace7fbf86 (patch) | |
| tree | ce9a74a7327020c48c80d278e1db5f12552f0fb0 /arch/x86_64/kernel/e820.c | |
| parent | f4256e301d9800b1e0276404cb01b3ac85b51067 (diff) | |
| parent | 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/x86_64/kernel/e820.c')
| -rw-r--r-- | arch/x86_64/kernel/e820.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c index ab3f87aaff70..17579a1a174b 100644 --- a/arch/x86_64/kernel/e820.c +++ b/arch/x86_64/kernel/e820.c | |||
| @@ -23,8 +23,7 @@ | |||
| 23 | #include <asm/e820.h> | 23 | #include <asm/e820.h> |
| 24 | #include <asm/proto.h> | 24 | #include <asm/proto.h> |
| 25 | #include <asm/bootsetup.h> | 25 | #include <asm/bootsetup.h> |
| 26 | 26 | #include <asm/sections.h> | |
| 27 | extern char _end[]; | ||
| 28 | 27 | ||
| 29 | /* | 28 | /* |
| 30 | * PFN of last memory page. | 29 | * PFN of last memory page. |