Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7a5274d authored by Len Brown's avatar Len Brown
Browse files

Pull suspend-2.6.24 into release branch

parents ceaeee6a 74d0f333

arch/x86/kernel/acpi/wakeup_32.S

+0 −4
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ wakeup_code: 
	wakeup_code_start = .

	.code16



 	movw	$0xb800, %ax

	movw	%ax,%fs

	movw	$0x0e00 + 'L', %fs:(0x10)



	cli

	cld

drivers/hwmon/coretemp.c

+2 −3
Original line number Diff line number Diff line
@@ -337,11 +337,10 @@ static int coretemp_cpu_callback(struct notifier_block *nfb, 


	switch (action) {

	case CPU_ONLINE:

	case CPU_ONLINE_FROZEN:

	case CPU_DOWN_FAILED:

		coretemp_device_add(cpu);

		break;

	case CPU_DEAD:

	case CPU_DEAD_FROZEN:

	case CPU_DOWN_PREPARE:

		coretemp_device_remove(cpu);

		break;

	}

fs/jffs2/background.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int jffs2_garbage_collect_thread(void *_c) 


		/* Put_super will send a SIGKILL and then wait on the sem.

		 */

		while (signal_pending(current)) {

		while (signal_pending(current) || freezing(current)) {

			siginfo_t info;

			unsigned long signr;