Commit 3f858ae0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pm' and 'pm-sleep' 

* acpi-pm:
  ACPI / PM: LPIT: Register sysfs attributes based on FADT

* pm-sleep:
  x86-32, hibernate: Adjust in_suspend after resumed on 32bit system
  x86-32, hibernate: Set up temporary text mapping for 32bit system
  x86-32, hibernate: Switch to relocated restore code during resume on 32bit system
  x86-32, hibernate: Switch to original page table after resumed
  x86-32, hibernate: Use the page size macro instead of constant value
  x86-32, hibernate: Use temp_pgt as the temporary page table
  x86, hibernate: Rename temp_level4_pgt to temp_pgt
  x86-32, hibernate: Enable CONFIG_ARCH_HIBERNATION_HEADER on 32bit system
  x86, hibernate: Extract the common code of 64/32 bit system
  x86-32/asm/power: Create stack frames in hibernate_asm_32.S
  PM / hibernate: Check the success of generating md5 digest before hibernation
  x86, hibernate: Fix nosave_regions setup for hibernation
  PM / sleep: Show freezing tasks that caused a suspend abort
  PM / hibernate: Documentation: fix image_size default value
parents d1551f7a 1cdda948 1fca4ba0

Documentation/ABI/testing/sysfs-power

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ Description: 
		this file, the suspend image will be as small as possible.



		Reading from this file will display the current image size

		limit, which is set to 500 MB by default.

		limit, which is set to around 2/5 of available RAM by default.



What:		/sys/power/pm_trace

Date:		August 2006

Documentation/power/swsusp.txt

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ If you want to limit the suspend image size to N bytes, do 


echo N > /sys/power/image_size



before suspend (it is limited to 500 MB by default).

before suspend (it is limited to around 2/5 of available RAM by default).



. The resume process checks for the presence of the resume device,

if found, it then checks the contents for the hibernation image signature.

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2422,7 +2422,7 @@ menu "Power management and ACPI options" 


config ARCH_HIBERNATION_HEADER

	def_bool y

	depends on X86_64 && HIBERNATION

	depends on HIBERNATION



source "kernel/power/Kconfig"

arch/x86/include/asm/suspend.h

+8 −0
Original line number Diff line number Diff line
@@ -4,3 +4,11 @@ 
#else

# include <asm/suspend_64.h>

#endif

extern unsigned long restore_jump_address __visible;

extern unsigned long jump_address_phys;

extern unsigned long restore_cr3 __visible;

extern unsigned long temp_pgt __visible;

extern unsigned long relocated_restore_code __visible;

extern int relocate_restore_code(void);

/* Defined in hibernate_asm_32/64.S */

extern asmlinkage __visible int restore_image(void);

arch/x86/include/asm/suspend_32.h

+4 −0
Original line number Diff line number Diff line
@@ -32,4 +32,8 @@ struct saved_context { 
	unsigned long return_address;

} __attribute__((packed));



/* routines for saving/restoring kernel state */

extern char core_restore_code[];

extern char restore_registers[];



#endif /* _ASM_X86_SUSPEND_32_H */