From 180257ba78dfdf689fbeae061d7fb14d8a1855b7 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Wed, 20 Jul 2011 14:18:46 +0100 Subject: [PATCH] --- yaml --- r: 263579 b: refs/heads/master c: dfc40b24c0a37593724f3317cd485c73ee878c18 h: refs/heads/master i: 263577: bfd75dda879d79156356457610832aa3d63aadbb 263575: 533d8f464ebebca7cb212792ff59491e1189d7c0 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/smp_twd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a9acd3bed6bc..65d9ef8d7a6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cb843ca0f781b62dc9793b26926d0b8efef5576 +refs/heads/master: dfc40b24c0a37593724f3317cd485c73ee878c18 diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c index 2c277d40cee6..01c186222f3b 100644 --- a/trunk/arch/arm/kernel/smp_twd.c +++ b/trunk/arch/arm/kernel/smp_twd.c @@ -137,8 +137,8 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk) clk->max_delta_ns = clockevent_delta2ns(0xffffffff, clk); clk->min_delta_ns = clockevent_delta2ns(0xf, clk); + clockevents_register_device(clk); + /* Make sure our local interrupt controller has this enabled */ gic_enable_ppi(clk->irq); - - clockevents_register_device(clk); }