Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e

Authored by Torben Hohn
Committed by Thomas Gleixner
1 parent 1aabd67d2e
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

m32r: Switch from do_timer() to xtime_update() 

xtime_update() does proper locking.

Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127150001.23248.68620.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 1 changed file with 2 additions and 3 deletions Side-by-side Diff

arch/m32r/kernel/time.c
Diff comments   View file @ 7bde2ab
... ... @@ -107,15 +107,14 @@
107 107  
108 108 /*
109 109 * timer_interrupt() needs to keep up the real-time clock,
110   - * as well as call the "do_timer()" routine every clocktick
  110 + * as well as call the "xtime_update()" routine every clocktick
111 111 */
112 112 static irqreturn_t timer_interrupt(int irq, void *dev_id)
113 113 {
114 114 #ifndef CONFIG_SMP
115 115 profile_tick(CPU_PROFILING);
116 116 #endif
117   - /* XXX FIXME. Uh, the xtime_lock should be held here, no? */
118   - do_timer(1);
  117 + xtime_update(1);
119 118  
120 119 #ifndef CONFIG_SMP
121 120 update_process_times(user_mode(get_irq_regs()));