Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df2e7f52 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: fix build of pcic 



Left-overs for an earlier iteration of the generic clock events patch removed.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Kirill Tkhai <tkhai@yandex.ru>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62f08283

arch/sparc/kernel/pcic.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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;