diff options
author | Len Brown <len.brown@intel.com> | 2011-01-12 05:02:22 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-01-12 05:02:22 -0500 |
commit | 03b6e6e58d9dd5f3068288653810db3c15fde929 (patch) | |
tree | b6edb300df2e230230f1f7428ffa54f27b0a040d /arch | |
parent | 9e0c20bceb611917a7546172ac617d07e5af0cfa (diff) | |
parent | 81e88fdc432a1552401d6e91a984dcccce72b8dc (diff) |
Merge branch 'apei' into release
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/dumpstack.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 71232b941b6..c2d0baa48d8 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -504,6 +504,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) | |||
504 | 504 | ||
505 | return 0; | 505 | return 0; |
506 | } | 506 | } |
507 | EXPORT_SYMBOL_GPL(acpi_gsi_to_irq); | ||
507 | 508 | ||
508 | int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) | 509 | int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) |
509 | { | 510 | { |
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 6e8752c1bd5..d34cf80ec40 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
@@ -240,6 +240,7 @@ unsigned __kprobes long oops_begin(void) | |||
240 | bust_spinlocks(1); | 240 | bust_spinlocks(1); |
241 | return flags; | 241 | return flags; |
242 | } | 242 | } |
243 | EXPORT_SYMBOL_GPL(oops_begin); | ||
243 | 244 | ||
244 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | 245 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) |
245 | { | 246 | { |