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

Commit a362c638 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

clocksource/events: Fix fallout of generic code changes 



powerpc grew a new warning due to the type change of clockevent->mult.

The architectures which use parts of the generic time keeping
infrastructure tripped over my wrong assumption that
clocksource_register is only used when GENERIC_TIME=y.

I should have looked and also I should have known better. These
renitent Gaul villages are racking my nerves. Some serious deprecating
is due.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 97813f2f

arch/powerpc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static void register_decrementer_clockevent(int cpu) 
	*dec = decrementer_clockevent;

	dec->cpumask = cpumask_of(cpu);



	printk(KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",

	printk(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n",

	       dec->name, dec->mult, dec->shift, cpu);



	clockevents_register_device(dec);

kernel/time/clocksource.c

+2 −2
Original line number Diff line number Diff line
@@ -466,8 +466,6 @@ void clocksource_touch_watchdog(void) 
	clocksource_resume_watchdog();

}



#ifdef CONFIG_GENERIC_TIME



/**

 * clocksource_max_deferment - Returns max time the clocksource can be deferred

 * @cs:         Pointer to clocksource
@@ -509,6 +507,8 @@ static u64 clocksource_max_deferment(struct clocksource *cs) 
	return max_nsecs - (max_nsecs >> 5);

}



#ifdef CONFIG_GENERIC_TIME



/**

 * clocksource_select - Select the best clocksource available

 *