[SPARC64]: Unify timer interrupt handler.

Things were scattered all over the place, split between
SMP and non-SMP.

Unify it all so that dyntick support is easier to add.

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

3 files changed, 4 insertions, 31 deletions

diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h
index f2cc9411b4c7..e89922d6718c 100644
--- a/include/asm-sparc64/cpudata.h
+++ b/include/asm-sparc64/cpudata.h
@@ -17,8 +17,8 @@
 typedef struct {
         /* Dcache line 1 */
         unsigned int    __softirq_pending; /* must be 1st, see rtrap.S */
-        unsigned int    multiplier;
-        unsigned int    counter;
+        unsigned int    __pad0_1;
+        unsigned int    __pad0_2;
         unsigned int    __pad1;
         unsigned long   clock_tick;     /* %tick's per second */
         unsigned long   udelay_val;
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
index 388249b751c3..cca54804b722 100644
--- a/include/asm-sparc64/smp.h
+++ b/include/asm-sparc64/smp.h
@@ -42,15 +42,15 @@ extern int hard_smp_processor_id(void);
 #define raw_smp_processor_id() (current_thread_info()->cpu)
 
 extern void smp_setup_cpu_possible_map(void);
+extern unsigned char boot_cpu_id;
 
 #endif /* !(__ASSEMBLY__) */
 
 #else
 
 #define smp_setup_cpu_possible_map() do { } while (0)
+#define boot_cpu_id     (0)
 
 #endif /* !(CONFIG_SMP) */
 
-#define NO_PROC_ID              0xFF
-
 #endif /* !(_SPARC64_SMP_H) */
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
index c2a16e188499..bbb9c8f13d61 100644
--- a/include/asm-sparc64/ttable.h
+++ b/include/asm-sparc64/ttable.h
@@ -157,23 +157,6 @@
         ba,a,pt %xcc, rtrap_irq;                        \
         .previous;
 
-#define TICK_SMP_IRQ                                    \
-        rdpr    %pil, %g2;                              \
-        wrpr    %g0, 15, %pil;                          \
-        sethi   %hi(1f-4), %g7;                         \
-        ba,pt   %xcc, etrap_irq;                        \
-         or     %g7, %lo(1f-4), %g7;                    \
-        nop;                                            \
-        nop;                                            \
-        nop;                                            \
-        .subsection     2;                              \
-1:      call    trace_hardirqs_off;                     \
-         nop;                                           \
-        call    smp_percpu_timer_interrupt;             \
-         add    %sp, PTREGS_OFF, %o0;                   \
-        ba,a,pt %xcc, rtrap_irq;                        \
-        .previous;
-
 #else
 
 #define TRAP_IRQ(routine, level)                        \
@@ -186,16 +169,6 @@
          add    %sp, PTREGS_OFF, %o1;                   \
         ba,a,pt %xcc, rtrap_irq;
         
-#define TICK_SMP_IRQ                                    \
-        rdpr    %pil, %g2;                              \
-        wrpr    %g0, 15, %pil;                          \
-        sethi   %hi(109f), %g7;                         \
-        ba,pt   %xcc, etrap_irq;                        \
-109:     or     %g7, %lo(109b), %g7;                    \
-        call    smp_percpu_timer_interrupt;             \
-         add    %sp, PTREGS_OFF, %o0;                   \
-        ba,a,pt %xcc, rtrap_irq;
-
 #endif
 
 #define TRAP_IVEC TRAP_NOSAVE(do_ivec)