From 32b06796c3bce79ca83167754d34d721c2f48716 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 7 May 2012 19:19:56 +0200
Subject: [PATCH] --- yaml --- r: 305016 b: refs/heads/master c:
 9438ef7f4ea73d5430a330fc206f97826eb9fb16 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/setup.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a2263d1b6417..4e7bd2e1d545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42fa4250436304d4650fa271f37671f6cee24e08
+refs/heads/master: 9438ef7f4ea73d5430a330fc206f97826eb9fb16
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 8526317c5f0b..7e67c5a71061 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -1012,7 +1012,8 @@ void __init setup_arch(char **cmdline_p)
 	init_cpu_to_node();
 
 	init_apic_mappings();
-	x86_io_apic_ops.init();
+	if (x86_io_apic_ops.init)
+		x86_io_apic_ops.init();
 
 	kvm_guest_init();