Commit de68d9b1 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

clockevents: Allow build w/o run-tine usage for migration purposes 



Migration aid to allow preparatory patches which introduce not yet
used parts of clock events code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
parent 7f8033b7

include/linux/clockchips.h

+6 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef _LINUX_CLOCKCHIPS_H

#define _LINUX_CLOCKCHIPS_H



#ifdef CONFIG_GENERIC_CLOCKEVENTS

#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD



#include <linux/clocksource.h>

#include <linux/cpumask.h>
@@ -126,9 +126,13 @@ extern int clockevents_register_notifier(struct notifier_block *nb); 
extern int clockevents_program_event(struct clock_event_device *dev,

				     ktime_t expires, ktime_t now);



#ifdef CONFIG_GENERIC_CLOCKEVENTS

extern void clockevents_notify(unsigned long reason, void *arg);



#else

# define clockevents_notify(reason, arg) do { } while (0)

#endif



#else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */



#define clockevents_notify(reason, arg) do { } while (0)

kernel/time/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -23,3 +23,8 @@ config HIGH_RES_TIMERS 
	  hardware is not capable then this option only increases

	  the size of the kernel image.



config GENERIC_CLOCKEVENTS_BUILD

	bool

	default y

	depends on GENERIC_CLOCKEVENTS || GENERIC_CLOCKEVENTS_MIGR

kernel/time/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o



obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= clockevents.o

obj-$(CONFIG_GENERIC_CLOCKEVENTS_BUILD)		+= clockevents.o

obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= tick-common.o

obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= tick-broadcast.o

obj-$(CONFIG_TICK_ONESHOT)			+= tick-oneshot.o

kernel/time/clockevents.c

+2 −1
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ void clockevents_exchange_device(struct clock_event_device *old, 
	local_irq_restore(flags);

}



#ifdef CONFIG_GENERIC_CLOCKEVENTS

/**

 * clockevents_notify - notification about relevant events

 */
@@ -222,4 +223,4 @@ void clockevents_notify(unsigned long reason, void *arg) 
	spin_unlock(&clockevents_lock);

}

EXPORT_SYMBOL_GPL(clockevents_notify);

#endif