summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorDaniel Kiper <dkiper@net-space.pl>2010-08-20 00:46:16 +0200
committerIngo Molnar <mingo@elte.hu>2010-08-20 10:18:28 +0200
commit05e407603e527f9d808dd3866d3a17c2ce4dfcc5 (patch)
treee6b6b956d70b1a9624b11b8d597559ca4b2a8cdf /arch/x86
parentd7c53c9e822a4fefa13a0cae76f3190bfd0d5c11 (diff)
x86, apic: Fix apic=debug boot crash
Fix a boot crash when apic=debug is used and the APIC is not properly initialized. This issue appears during Xen Dom0 kernel boot but the fix is generic and the crash could occur on real hardware as well. Signed-off-by: Daniel Kiper <dkiper@net-space.pl> Cc: xen-devel@lists.xensource.com Cc: konrad.wilk@oracle.com Cc: jeremy@goop.org Cc: <stable@kernel.org> # .35.x, .34.x, .33.x, .32.x LKML-Reference: <20100819224616.GB9967@router-fw-old.local.net-space.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/apic/io_apic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 4dc0084ec1b1..f1efebaf5510 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1728,6 +1728,8 @@ __apicdebuginit(void) print_IO_APIC(void)
struct irq_pin_list *entry;
cfg = desc->chip_data;
+ if (!cfg)
+ continue;
entry = cfg->irq_2_pin;
if (!entry)
continue;