---

yaml --- r: 332279 b: refs/heads/master c: 1c59924 h: refs/heads/master i: 332277: e70ef44 332275: 251ce8e 332271: 7b48d5e v: v3
git-mirror · Aug 22, 2012 · 9a37658 · 9a37658
1 parent 91ea4fd
commit 9a37658
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62cedc4fde2d15b08e4502aa3fb2d9d798f3ccd8
+refs/heads/master: 1c5992427b8c7d61052a3eaac05e98791c6163b7
diff --git a/trunk/arch/mips/kernel/smp-mt.c b/trunk/arch/mips/kernel/smp-mt.c
@@ -150,13 +150,15 @@ static void vsmp_send_ipi_mask(const struct cpumask *mask, unsigned int action)
 
 static void __cpuinit vsmp_init_secondary(void)
 {
+#ifdef CONFIG_IRQ_GIC
 	extern int gic_present;
 
 	/* This is Malta specific: IPI,performance and timer interrupts */
 	if (gic_present)
 		change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 |
 					 STATUSF_IP6 | STATUSF_IP7);
 	else
+#endif
 		change_c0_status(ST0_IM, STATUSF_IP0 | STATUSF_IP1 |
 					 STATUSF_IP6 | STATUSF_IP7);
 }