소스 검색

x86, hibernate: Rename temp_level4_pgt to temp_pgt

As 32bit system is not using 4-level page, rename it
to temp_pgt so that it can be reused for both 32bit
and 64bit hibernation.

No functional change.

Signed-off-by: Zhimin Gu <kookoo.gu@intel.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Zhimin Gu 6 년 전
부모
커밋
72adf47764
4개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      arch/x86/include/asm/suspend.h
  2. 1 1
      arch/x86/power/hibernate.c
  3. 1 1
      arch/x86/power/hibernate_64.c
  4. 1 1
      arch/x86/power/hibernate_asm_64.S

+ 1 - 1
arch/x86/include/asm/suspend.h

@@ -7,7 +7,7 @@
 extern unsigned long restore_jump_address __visible;
 extern unsigned long restore_jump_address __visible;
 extern unsigned long jump_address_phys;
 extern unsigned long jump_address_phys;
 extern unsigned long restore_cr3 __visible;
 extern unsigned long restore_cr3 __visible;
-extern unsigned long temp_level4_pgt __visible;
+extern unsigned long temp_pgt __visible;
 extern unsigned long relocated_restore_code __visible;
 extern unsigned long relocated_restore_code __visible;
 extern int relocate_restore_code(void);
 extern int relocate_restore_code(void);
 /* Defined in hibernate_asm_32/64.S */
 /* Defined in hibernate_asm_32/64.S */

+ 1 - 1
arch/x86/power/hibernate.c

@@ -36,7 +36,7 @@ unsigned long jump_address_phys;
  * in the image header).
  * in the image header).
  */
  */
 unsigned long restore_cr3 __visible;
 unsigned long restore_cr3 __visible;
-unsigned long temp_level4_pgt __visible;
+unsigned long temp_pgt __visible;
 unsigned long relocated_restore_code __visible;
 unsigned long relocated_restore_code __visible;
 
 
 /**
 /**

+ 1 - 1
arch/x86/power/hibernate_64.c

@@ -121,7 +121,7 @@ static int set_up_temporary_mappings(void)
 			return result;
 			return result;
 	}
 	}
 
 
-	temp_level4_pgt = __pa(pgd);
+	temp_pgt = __pa(pgd);
 	return 0;
 	return 0;
 }
 }
 
 

+ 1 - 1
arch/x86/power/hibernate_asm_64.S

@@ -59,7 +59,7 @@ ENTRY(restore_image)
 	movq	restore_cr3(%rip), %r9
 	movq	restore_cr3(%rip), %r9
 
 
 	/* prepare to switch to temporary page tables */
 	/* prepare to switch to temporary page tables */
-	movq	temp_level4_pgt(%rip), %rax
+	movq	temp_pgt(%rip), %rax
 	movq	mmu_cr4_features(%rip), %rbx
 	movq	mmu_cr4_features(%rip), %rbx
 
 
 	/* prepare to copy image data to their original locations */
 	/* prepare to copy image data to their original locations */