Commit 047f61c5 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-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (42 commits)
  ACPI: minor printk format change in acpi_pad
  ACPI: make acpi_pad /sys output more readable
  ACPICA: Update version to 20110316
  ACPICA: Header support for SLIC table
  ACPI: Make sure the FADT is at least rev 2 before using the reset register
  ACPI: Bug compatibility for Windows on the ACPI reboot vector
  ACPICA: Fix access width for reset vector
  ACPI battery: fribble sysfs files from a resume notifier
  ACPI button: remove unused procfs I/F
  ACPI, APEI, Add PCIe AER error information printing support
  PCIe, AER, use pre-generated prefix in error information printing
  ACPI, APEI, Add ERST record ID cache
  ACPI: Use syscore_ops instead of sysdev class and sysdev
  ACPI: Remove the unused EC sysdev class
  ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree
  ACPI: use __init where possible in processor driver
  Thermal_Framework-Fix_crash_during_hwmon_unregister
  ACPICA: Update version to 20110211.
  ACPICA: Add mechanism to defer _REG methods for some installed handlers
  ACPICA: Add support for FunctionalFixedHW in acpi_ut_get_region_name
  ...
parents 05061bf6 3d26678e

Documentation/acpi/apei/output_format.txt

+25 −0
Original line number Diff line number Diff line
@@ -92,6 +92,11 @@ vendor_id: <integer>, device_id: <integer> 
class_code: <integer>]

[serial number: <integer>, <integer>]

[bridge: secondary_status: <integer>, control: <integer>]

[aer_status: <integer>, aer_mask: <integer>

<aer status string>

[aer_uncor_severity: <integer>]

aer_layer=<aer layer string>, aer_agent=<aer agent string>

aer_tlp_header: <integer> <integer> <integer> <integer>]



<pcie port type string>* := PCIe end point | legacy PCI end point | \

unknown | unknown | root port | upstream switch port | \
@@ -99,6 +104,26 @@ downstream switch port | PCIe to PCI/PCI-X bridge | \ 
PCI/PCI-X to PCIe bridge | root complex integrated endpoint device | \

root complex event collector



if section severity is fatal or recoverable

<aer status string># :=

unknown | unknown | unknown | unknown | Data Link Protocol | \

unknown | unknown | unknown | unknown | unknown | unknown | unknown | \

Poisoned TLP | Flow Control Protocol | Completion Timeout | \

Completer Abort | Unexpected Completion | Receiver Overflow | \

Malformed TLP | ECRC | Unsupported Request

else

<aer status string># :=

Receiver Error | unknown | unknown | unknown | unknown | unknown | \

Bad TLP | Bad DLLP | RELAY_NUM Rollover | unknown | unknown | unknown | \

Replay Timer Timeout | Advisory Non-Fatal

fi



<aer layer string> :=

Physical Layer | Data Link Layer | Transaction Layer



<aer agent string> :=

Receiver ID | Requester ID | Completer ID | Transmitter ID



Where, [] designate corresponding content is optional



All <field string> description with * has the following format:

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Diff line number Diff line
@@ -270,14 +270,6 @@ Who: Zhang Rui <rui.zhang@intel.com> 


---------------------------



What:	/proc/acpi/button

When:	August 2007

Why:	/proc/acpi/button has been replaced by events to the input layer

	since 2.6.20.

Who:	Len Brown <len.brown@intel.com>



---------------------------



What:	/proc/acpi/event

When:	February 2008

Why:	/proc/acpi/event has been replaced by events via the input layer

arch/ia64/include/asm/acpi.h

+3 −3
Original line number Diff line number Diff line
@@ -128,9 +128,9 @@ static inline const char *acpi_get_sysname (void) 
int acpi_request_vector (u32 int_type);

int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);



/* routines for saving/restoring kernel state */

extern int acpi_save_state_mem(void);

extern void acpi_restore_state_mem(void);

/* Low-level suspend routine. */

extern int acpi_suspend_lowlevel(void);



extern unsigned long acpi_wakeup_address;



/*

arch/ia64/kernel/acpi.c

+9 −14
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) 
 *  ACPI based hotplug CPU support

 */

#ifdef CONFIG_ACPI_HOTPLUG_CPU

static

static __cpuinit

int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

#ifdef CONFIG_ACPI_NUMA
@@ -878,7 +878,7 @@ __init void prefill_possible_map(void) 
		set_cpu_possible(i, true);

}



int acpi_map_lsapic(acpi_handle handle, int *pcpu)

static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;
@@ -929,6 +929,11 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) 
	return (0);

}



/* wrapper to silence section mismatch warning */

int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu)

{

	return _acpi_map_lsapic(handle, pcpu);

}

EXPORT_SYMBOL(acpi_map_lsapic);



int acpi_unmap_lsapic(int cpu)
@@ -1034,18 +1039,8 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base) 
EXPORT_SYMBOL(acpi_unregister_ioapic);



/*

 * acpi_save_state_mem() - save kernel state

 * acpi_suspend_lowlevel() - save kernel state and suspend.

 *

 * TBD when when IA64 starts to support suspend...

 */

int acpi_save_state_mem(void) { return 0; } 



/*

 * acpi_restore_state()

 */

void acpi_restore_state_mem(void) {}



/*

 * do_suspend_lowlevel()

 */

void do_suspend_lowlevel(void) {}
 
int acpi_suspend_lowlevel(void) { return 0; }

arch/x86/include/asm/acpi.h

+2 −3
Original line number Diff line number Diff line
@@ -114,9 +114,8 @@ static inline void acpi_disable_pci(void) 
	acpi_noirq_set();

}



/* routines for saving/restoring kernel state */

extern int acpi_save_state_mem(void);

extern void acpi_restore_state_mem(void);

/* Low-level suspend routine. */

extern int acpi_suspend_lowlevel(void);



extern const unsigned char acpi_wakeup_code[];

#define acpi_wakeup_address (__pa(TRAMPOLINE_SYM(acpi_wakeup_code)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE