evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert "Hibernation: Use temporary page tables for kernel text mapping on x86_64"

Browse source 
Revert commit efa4d2fb04 ("Hibernation:
Use temporary page tables for kernel text mapping on x86_64") because it
causes my t61p to reboot right at the end of resume-from-disk.  For
reasons unknown at this time.

Cc: Pavel Machek <pavel@ucw.cz>
Cc: Andi Kleen <ak@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2007-12-17 16:19:45 -08:00 • committed by Linus Torvalds
parent 755271358c
commit 5867a78f41
1 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
arch/x86/kernel/suspend_64.c
View file

@ -192,42 +192,25 @@ static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long en
return 0; return 0;
} }
static int res_kernel_text_pud_init(pud_t *pud, unsigned long start)
{
pmd_t *pmd;
unsigned long paddr;
pmd = (pmd_t *)get_safe_page(GFP_ATOMIC);
if (!pmd)
return -ENOMEM;
set_pud(pud + pud_index(start), __pud(__pa(pmd) | _KERNPG_TABLE));
for (paddr = 0; paddr < KERNEL_TEXT_SIZE; pmd++, paddr += PMD_SIZE) {
unsigned long pe;
pe = __PAGE_KERNEL_LARGE_EXEC | _PAGE_GLOBAL | paddr;
pe &= __supported_pte_mask;
set_pmd(pmd, __pmd(pe));
}
return 0;
}
static int set_up_temporary_mappings(void) static int set_up_temporary_mappings(void)
{ {
unsigned long start, end, next; unsigned long start, end, next;
pud_t *pud;
int error; int error;
temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC); temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);
if (!temp_level4_pgt) if (!temp_level4_pgt)
return -ENOMEM; return -ENOMEM;
/* It is safe to reuse the original kernel mapping */
set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map),
init_level4_pgt[pgd_index(__START_KERNEL_map)]);
/* Set up the direct mapping from scratch */ /* Set up the direct mapping from scratch */
start = (unsigned long)pfn_to_kaddr(0); start = (unsigned long)pfn_to_kaddr(0);
end = (unsigned long)pfn_to_kaddr(end_pfn); end = (unsigned long)pfn_to_kaddr(end_pfn);
for (; start < end; start = next) { for (; start < end; start = next) {
pud = (pud_t *)get_safe_page(GFP_ATOMIC); pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC);
if (!pud) if (!pud)
return -ENOMEM; return -ENOMEM;
next = start + PGDIR_SIZE; next = start + PGDIR_SIZE;
@ -238,17 +221,7 @@ static int set_up_temporary_mappings(void)
set_pgd(temp_level4_pgt + pgd_index(start), set_pgd(temp_level4_pgt + pgd_index(start),
mk_kernel_pgd(__pa(pud))); mk_kernel_pgd(__pa(pud)));
} }
return 0;
/* Set up the kernel text mapping from scratch */
pud = (pud_t *)get_safe_page(GFP_ATOMIC);
if (!pud)
return -ENOMEM;
error = res_kernel_text_pud_init(pud, __START_KERNEL_map);
if (!error)
set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map),
__pgd(__pa(pud) | _PAGE_TABLE));
return error;
} }
int swsusp_arch_resume(void) int swsusp_arch_resume(void)