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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 

Pull ACPI and power management fixes from Len Brown:
 "A 3.3 sleep regression fixed, numa bugfix, plus some minor cleanups"

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  ACPI processor: Fix tick_broadcast_mask online/offline regression
  ACPI: Only count valid srat memory structures
  ACPI: Untangle a return statement for better readability
  ACPI / PCI: Do not try to acquire _OSC control if that is hopeless
  ACPI: delete _GTS/_BFS support
  ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler'
  ACPI: replace strlen("string") with sizeof("string") -1
  ACPI / PM: Fix build warning in sleep.c for CONFIG_ACPI_SLEEP unset
parents d42d1dab 9d0b01a1

arch/ia64/kernel/acpi.c

+3 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) 
	srat_num_cpus++;

}



void __init

int __init

acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)

{

	unsigned long paddr, size;
@@ -512,7 +512,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 


	/* Ignore disabled entries */

	if (!(ma->flags & ACPI_SRAT_MEM_ENABLED))

		return;

		return -1;



	/* record this node in proximity bitmap */

	pxm_bit_set(pxm);
@@ -531,6 +531,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 
	p->size = size;

	p->nid = pxm;

	num_node_memblks++;

	return 0;

}



void __init acpi_numa_arch_fixup(void)

arch/x86/kernel/acpi/sleep.c

+0 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ unsigned long acpi_realmode_flags; 
static char temp_stack[4096];

#endif



asmlinkage void acpi_enter_s3(void)

{

	acpi_enter_sleep_state(3, wake_sleep_flags);

}

/**

 * acpi_suspend_lowlevel - save kernel state

 *

arch/x86/kernel/acpi/sleep.h

+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
 *	Variables and functions used by the code in sleep.c

 */



#include <linux/linkage.h>

#include <asm/realmode.h>



extern unsigned long saved_video_mode;
@@ -11,7 +10,6 @@ extern long saved_magic; 
extern int wakeup_pmode_return;



extern u8 wake_sleep_flags;

extern asmlinkage void acpi_enter_s3(void);



extern unsigned long acpi_copy_wakeup_routine(unsigned long);

extern void wakeup_long64(void);

arch/x86/kernel/acpi/wakeup_32.S

+3 −1
Original line number Diff line number Diff line
@@ -74,7 +74,9 @@ restore_registers: 
ENTRY(do_suspend_lowlevel)

	call	save_processor_state

	call	save_registers

	call	acpi_enter_s3

	pushl	$3

	call	acpi_enter_sleep_state

	addl	$4, %esp



#	In case of S3 failure, we'll emerge here.  Jump

# 	to ret_point to recover

arch/x86/kernel/acpi/wakeup_64.S

+3 −1
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ ENTRY(do_suspend_lowlevel) 
	movq	%rsi, saved_rsi



	addq	$8, %rsp

	call	acpi_enter_s3

	movl	$3, %edi

	xorl	%eax, %eax

	call	acpi_enter_sleep_state

	/* in case something went wrong, restore the machine status and go on */

	jmp	resume_point

CRA Git | Maintained and supported by SUSTech CRA and CCSE