aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/machine_kexec_64.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-09 11:39:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-09 11:39:02 +0200
commitd028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch)
tree6bd73a5c70b407491dc9d40ecb9e95b48233d004 /arch/x86/kernel/machine_kexec_64.c
parentf57e91682d141ea50d8c6d42cdc251b6256a3755 (diff)
parent183fe065652dbd64953afa9f389327e23e97967f (diff)
downloadkernel_samsung_tuna-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.zip
kernel_samsung_tuna-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.tar.gz
kernel_samsung_tuna-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.tar.bz2
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'arch/x86/kernel/machine_kexec_64.c')
-rw-r--r--arch/x86/kernel/machine_kexec_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 576a03d..7830dc4 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -110,7 +110,7 @@ static int init_pgtable(struct kimage *image, unsigned long start_pgtable)
{
pgd_t *level4p;
level4p = (pgd_t *)__va(start_pgtable);
- return init_level4_page(image, level4p, 0, end_pfn << PAGE_SHIFT);
+ return init_level4_page(image, level4p, 0, max_pfn << PAGE_SHIFT);
}
static void set_idt(void *newidt, u16 limit)