Commit ed7ba2ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: Clear -EAGAIN in dpm_prepare
  x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR
parents 4b99d352 886a7a33

arch/x86/power/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
# __restore_processor_state() restores %gs after S3 resume and so should not

# __restore_processor_state() restores %gs after S3 resume and so should not

# itself be stack-protected

# itself be stack-protected

nostackp := $(call cc-option, -fno-stack-protector)

nostackp := $(call cc-option, -fno-stack-protector)

CFLAGS_cpu_$(BITS).o	:= $(nostackp)

CFLAGS_cpu.o	:= $(nostackp)





obj-$(CONFIG_PM_SLEEP)		+= cpu.o

obj-$(CONFIG_PM_SLEEP)		+= cpu.o

obj-$(CONFIG_HIBERNATION)	+= hibernate_$(BITS).o hibernate_asm_$(BITS).o
 
obj-$(CONFIG_HIBERNATION)	+= hibernate_$(BITS).o hibernate_asm_$(BITS).o

drivers/base/power/main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -762,6 +762,7 @@ static int dpm_prepare(pm_message_t state) 
			dev->power.status = DPM_ON;

			dev->power.status = DPM_ON;

			if (error == -EAGAIN) {

			if (error == -EAGAIN) {

				put_device(dev);

				put_device(dev);

				error = 0;

				continue;

				continue;

			}

			}

			printk(KERN_ERR "PM: Failed to prepare device %s "

			printk(KERN_ERR "PM: Failed to prepare device %s "

CRA Git | Maintained and supported by SUSTech CRA and CCSE