diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/x86/power | |
parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/x86/power')
-rw-r--r-- | arch/x86/power/hibernate_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index b542355e0e34..6dd000dd7933 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c | |||
@@ -83,7 +83,7 @@ static int set_up_temporary_mappings(void) | |||
83 | 83 | ||
84 | /* Set up the direct mapping from scratch */ | 84 | /* Set up the direct mapping from scratch */ |
85 | start = (unsigned long)pfn_to_kaddr(0); | 85 | start = (unsigned long)pfn_to_kaddr(0); |
86 | end = (unsigned long)pfn_to_kaddr(end_pfn); | 86 | end = (unsigned long)pfn_to_kaddr(max_pfn); |
87 | 87 | ||
88 | for (; start < end; start = next) { | 88 | for (; start < end; start = next) { |
89 | pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC); | 89 | pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC); |