[SPARC64]: Fix uniprocessor IRQ targetting on SUN4V.

We need to use the real hardware processor ID when
targetting interrupts, not the "define to 0" thing
the uniprocessor build gives us.

Also, fill in the Node-ID and Agent-ID fields properly
on sun4u/Safari.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 9b0c409d5b6a..77066f1bbe2f 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -222,7 +222,6 @@ static struct pt_regs fake_swapper_regs = { { 0, }, 0, 0, 0, 0 };
 
 static void __init per_cpu_patch(void)
 {
-#ifdef CONFIG_SMP
         struct cpuid_patch_entry *p;
         unsigned long ver;
         int is_jbus;
@@ -233,8 +232,8 @@ static void __init per_cpu_patch(void)
         is_jbus = 0;
         if (tlb_type != hypervisor) {
                 __asm__ ("rdpr %%ver, %0" : "=r" (ver));
-                is_jbus = ((ver >> 32) == __JALAPENO_ID ||
-                           (ver >> 32) == __SERRANO_ID);
+                is_jbus = ((ver >> 32UL) == __JALAPENO_ID ||
+                           (ver >> 32UL) == __SERRANO_ID);
         }
 
         p = &__cpuid_patch;
@@ -279,7 +278,6 @@ static void __init per_cpu_patch(void)
 
                 p++;
         }
-#endif
 }
 
 static void __init sun4v_patch(void)