git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.26' into x86/core
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
machine_kexec_64.c
diff --git
a/arch/x86/kernel/machine_kexec_64.c
b/arch/x86/kernel/machine_kexec_64.c
index
576a03d
..
7830dc4
100644
(file)
--- 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)