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

Commit 320ab2b0 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: convert struct clock_event_device to cpumask pointers. 



Impact: change calling convention of existing clock_event APIs

struct clock_event_timer's cpumask field gets changed to take pointer,
as does the ->broadcast function.

Another single-patch change.  For safety, we BUG_ON() in
clockevents_register_device() if it's not set.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Ingo Molnar <mingo@elte.hu>
parent 0de26520

arch/arm/mach-at91/at91rm9200_time.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -169,7 +169,6 @@ static struct clock_event_device clkevt = { 
	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.shift		= 32,

	.shift		= 32,

	.rating		= 150,

	.rating		= 150,

	.cpumask	= CPU_MASK_CPU0,

	.set_next_event	= clkevt32k_next_event,

	.set_next_event	= clkevt32k_next_event,

	.set_mode	= clkevt32k_mode,

	.set_mode	= clkevt32k_mode,

};

};
@@ -197,7 +196,7 @@ void __init at91rm9200_timer_init(void) 
	clkevt.mult = div_sc(AT91_SLOW_CLOCK, NSEC_PER_SEC, clkevt.shift);

	clkevt.mult = div_sc(AT91_SLOW_CLOCK, NSEC_PER_SEC, clkevt.shift);

	clkevt.max_delta_ns = clockevent_delta2ns(AT91_ST_ALMV, &clkevt);

	clkevt.max_delta_ns = clockevent_delta2ns(AT91_ST_ALMV, &clkevt);

	clkevt.min_delta_ns = clockevent_delta2ns(2, &clkevt) + 1;

	clkevt.min_delta_ns = clockevent_delta2ns(2, &clkevt) + 1;

	clkevt.cpumask = cpumask_of_cpu(0);

	clkevt.cpumask = cpumask_of(0);

	clockevents_register_device(&clkevt);

	clockevents_register_device(&clkevt);





	/* register clocksource */

	/* register clocksource */

arch/arm/mach-at91/at91sam926x_time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,6 @@ static struct clock_event_device pit_clkevt = { 
	.features	= CLOCK_EVT_FEAT_PERIODIC,

	.features	= CLOCK_EVT_FEAT_PERIODIC,

	.shift		= 32,

	.shift		= 32,

	.rating		= 100,

	.rating		= 100,

	.cpumask	= CPU_MASK_CPU0,

	.set_mode	= pit_clkevt_mode,

	.set_mode	= pit_clkevt_mode,

};

};
@@ -173,6 +172,7 @@ static void __init at91sam926x_pit_init(void) 




	/* Set up and register clockevents */

	/* Set up and register clockevents */

	pit_clkevt.mult = div_sc(pit_rate, NSEC_PER_SEC, pit_clkevt.shift);

	pit_clkevt.mult = div_sc(pit_rate, NSEC_PER_SEC, pit_clkevt.shift);

	pit_clkevt.cpumask = cpumask_of(0);

	clockevents_register_device(&pit_clkevt);

	clockevents_register_device(&pit_clkevt);

}

}

arch/arm/mach-davinci/time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -322,7 +322,7 @@ static void __init davinci_timer_init(void) 
	clockevent_davinci.min_delta_ns =

	clockevent_davinci.min_delta_ns =

		clockevent_delta2ns(1, &clockevent_davinci);

		clockevent_delta2ns(1, &clockevent_davinci);





	clockevent_davinci.cpumask = cpumask_of_cpu(0);

	clockevent_davinci.cpumask = cpumask_of(0);

	clockevents_register_device(&clockevent_davinci);

	clockevents_register_device(&clockevent_davinci);

}

}

arch/arm/mach-imx/time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,7 @@ static int __init imx_clockevent_init(unsigned long rate) 
	clockevent_imx.min_delta_ns =

	clockevent_imx.min_delta_ns =

		clockevent_delta2ns(0xf, &clockevent_imx);

		clockevent_delta2ns(0xf, &clockevent_imx);





	clockevent_imx.cpumask = cpumask_of_cpu(0);

	clockevent_imx.cpumask = cpumask_of(0);





	clockevents_register_device(&clockevent_imx);

	clockevents_register_device(&clockevent_imx);

arch/arm/mach-ixp4xx/common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -487,7 +487,7 @@ static int __init ixp4xx_clockevent_init(void) 
		clockevent_delta2ns(0xfffffffe, &clockevent_ixp4xx);

		clockevent_delta2ns(0xfffffffe, &clockevent_ixp4xx);

	clockevent_ixp4xx.min_delta_ns =

	clockevent_ixp4xx.min_delta_ns =

		clockevent_delta2ns(0xf, &clockevent_ixp4xx);

		clockevent_delta2ns(0xf, &clockevent_ixp4xx);

	clockevent_ixp4xx.cpumask = cpumask_of_cpu(0);

	clockevent_ixp4xx.cpumask = cpumask_of(0);





	clockevents_register_device(&clockevent_ixp4xx);

	clockevents_register_device(&clockevent_ixp4xx);

	return 0;

	return 0;