]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
sparc32: fix build of pcic
authorSam Ravnborg <sam@ravnborg.org>
Mon, 16 Apr 2012 19:50:49 +0000 (21:50 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Apr 2012 21:36:47 +0000 (14:36 -0700)
Left-overs for an earlier iteration of the generic clock events patch removed.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kirill Tkhai <tkhai@yandex.ru>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/kernel/pcic.c

index 118a3f5806a8e467839fe0b3b9b352f135dd38cc..f0ec9396a40896c8e1e3841f0cbebd947155708e 100644 (file)
@@ -722,7 +722,7 @@ static unsigned int pcic_cycles_offset(void)
         */
        count = ((count / HZ) * USECS_PER_JIFFY) / (TICK_TIMER_LIMIT / HZ);
 
-       /* Coordinate with the fact that timer_cs rate is 2MHz */
+       /* Coordinate with the sparc_config.clock_rate setting */
        return count * 2;
 }
 
@@ -735,10 +735,10 @@ void __init pci_time_init(void)
 
 #ifndef CONFIG_SMP
        /*
-        * It's in SBUS dimension, because timer_cs is in this dimension.
+        * The clock_rate is in SBUS dimension.
         * We take into account this in pcic_cycles_offset()
         */
-       timer_cs_period = SBUS_CLOCK_RATE / HZ;
+       sparc_config.clock_rate = SBUS_CLOCK_RATE / HZ;
        sparc_config.features |= FEAT_L10_CLOCKEVENT;
 #endif
        sparc_config.features |= FEAT_L10_CLOCKSOURCE;