forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sparc32: fix build of pcic

Browse source 
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>
This commit is contained in:
Sam Ravnborg 2012-04-16 21:50:49 +02:00 • committed by David S. Miller
commit df2e7f525d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/sparc/kernel/pcic.c
View file

@ -722,7 +722,7 @@ static unsigned int pcic_cycles_offset(void)
*/ */
count = ((count / HZ) * USECS_PER_JIFFY) / (TICK_TIMER_LIMIT / HZ); 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; return count * 2;
} }
@ -735,10 +735,10 @@ void __init pci_time_init(void)
#ifndef CONFIG_SMP #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() * 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; sparc_config.features |= FEAT_L10_CLOCKEVENT;
#endif #endif
sparc_config.features |= FEAT_L10_CLOCKSOURCE; sparc_config.features |= FEAT_L10_CLOCKSOURCE;