lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'apei' into apei-release

Browse Source 
Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.

	arch/ia64/Kconfig
	arch/powerpc/Kconfig
	arch/x86/Kconfig
	lib/Kconfig
	lib/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2011-08-03 11:30:42 -04:00
parent c027a474a6 c3e6088e10
commit d0e323b470
35 changed files with 1172 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/acpi/apei.h
View File

@@ -18,6 +18,11 @@
extern int hest_disable;
extern int erst_disable;
#ifdef CONFIG_ACPI_APEI_GHES
extern int ghes_disable;
#else
#define ghes_disable 1
#endif
#ifdef CONFIG_ACPI_APEI
void __init acpi_hest_init(void);