From 9a3765897adbf4786deb9c2db719dbde23ef45f0 Mon Sep 17 00:00:00 2001 From: Anoop P A Date: Tue, 25 Jan 2011 19:27:26 +0530 Subject: [PATCH] --- yaml --- r: 332279 b: refs/heads/master c: 1c5992427b8c7d61052a3eaac05e98791c6163b7 h: refs/heads/master i: 332277: e70ef44ca58cea9172a0e8694f44108293279898 332275: 251ce8e950362e5b359c600fa3191502ef355901 332271: 7b48d5e49737a3fb3050544067080280c36362b9 v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/smp-mt.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c2480bd5c5a1..c2189d9605b5 100644 --- 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 index ff17868734cf..2defa2bbdaa7 100644 --- a/trunk/arch/mips/kernel/smp-mt.c +++ b/trunk/arch/mips/kernel/smp-mt.c @@ -150,6 +150,7 @@ 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 */ @@ -157,6 +158,7 @@ static void __cpuinit vsmp_init_secondary(void) 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); }