aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-04-16 15:50:49 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-16 17:36:47 -0400
commitdf2e7f525d88da992021b589d8a412afc15de36c (patch)
treef14007e9057fa78cd8b7cec531e4df3d8711bff9
parent62f082830d63cf753ed0dab16f8d3b2d0ffc7f43 (diff)
sparc32: fix build of pcic
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>
-rw-r--r--arch/sparc/kernel/pcic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 118a3f5806a8..f0ec9396a408 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -722,7 +722,7 @@ static unsigned int pcic_cycles_offset(void)
722 */ 722 */
723 count = ((count / HZ) * USECS_PER_JIFFY) / (TICK_TIMER_LIMIT / HZ); 723 count = ((count / HZ) * USECS_PER_JIFFY) / (TICK_TIMER_LIMIT / HZ);
724 724
725 /* Coordinate with the fact that timer_cs rate is 2MHz */ 725 /* Coordinate with the sparc_config.clock_rate setting */
726 return count * 2; 726 return count * 2;
727} 727}
728 728
@@ -735,10 +735,10 @@ void __init pci_time_init(void)
735 735
736#ifndef CONFIG_SMP 736#ifndef CONFIG_SMP
737 /* 737 /*
738 * It's in SBUS dimension, because timer_cs is in this dimension. 738 * The clock_rate is in SBUS dimension.
739 * We take into account this in pcic_cycles_offset() 739 * We take into account this in pcic_cycles_offset()
740 */ 740 */
741 timer_cs_period = SBUS_CLOCK_RATE / HZ; 741 sparc_config.clock_rate = SBUS_CLOCK_RATE / HZ;
742 sparc_config.features |= FEAT_L10_CLOCKEVENT; 742 sparc_config.features |= FEAT_L10_CLOCKEVENT;
743#endif 743#endif
744 sparc_config.features |= FEAT_L10_CLOCKSOURCE; 744 sparc_config.features |= FEAT_L10_CLOCKSOURCE;