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

Commit 9f083b74 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

clockevents: Remove CONFIG_GENERIC_CLOCKEVENTS_BUILD 



This option was for simpler migration to the clock events code.
Most architectures have been converted and the option has been
disfunctional as a standalone option for quite some time. Remove
it.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/5021859.jl9OC1medj@vostro.rjw.lan


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3071efa4

include/linux/clockchips.h

+3 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ enum clock_event_nofitiers { 
	CLOCK_EVT_NOTIFY_CPU_DEAD,

};



#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD

#ifdef CONFIG_GENERIC_CLOCKEVENTS



#include <linux/clocksource.h>

#include <linux/cpumask.h>
@@ -229,13 +229,9 @@ static inline int tick_check_broadcast_expired(void) { return 0; } 
static inline void tick_setup_hrtimer_broadcast(void) {};

#endif



#ifdef CONFIG_GENERIC_CLOCKEVENTS

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

#else

static inline int clockevents_notify(unsigned long reason, void *arg) { return 0; }

#endif



#else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */

#else /* CONFIG_GENERIC_CLOCKEVENTS */



static inline void clockevents_suspend(void) {}

static inline void clockevents_resume(void) {}
@@ -243,6 +239,7 @@ static inline void clockevents_resume(void) {} 
static inline int clockevents_notify(unsigned long reason, void *arg) { return 0; }

static inline int tick_check_broadcast_expired(void) { return 0; }

static inline void tick_setup_hrtimer_broadcast(void) {};

static inline int clockevents_notify(unsigned long reason, void *arg) { return 0; }



#endif

kernel/time/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -33,12 +33,6 @@ config ARCH_USES_GETTIMEOFFSET 
config GENERIC_CLOCKEVENTS

	bool



# Migration helper. Builds, but does not invoke

config GENERIC_CLOCKEVENTS_BUILD

	bool

	default y

	depends on GENERIC_CLOCKEVENTS



# Architecture can handle broadcast in a driver-agnostic way

config ARCH_HAS_TICK_BROADCAST

	bool

kernel/time/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -2,15 +2,13 @@ obj-y += time.o timer.o hrtimer.o itimer.o posix-timers.o posix-cpu-timers.o 
obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o

obj-y += timeconv.o timecounter.o posix-clock.o alarmtimer.o



obj-$(CONFIG_GENERIC_CLOCKEVENTS_BUILD)		+= clockevents.o

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

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

ifeq ($(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST),y)

 obj-y						+= tick-broadcast.o

 obj-$(CONFIG_TICK_ONESHOT)			+= tick-broadcast-hrtimer.o

endif

obj-$(CONFIG_GENERIC_SCHED_CLOCK)		+= sched_clock.o

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

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

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

obj-$(CONFIG_TIMER_STATS)			+= timer_stats.o

obj-$(CONFIG_DEBUG_FS)				+= timekeeping_debug.o

obj-$(CONFIG_TEST_UDELAY)			+= test_udelay.o

kernel/time/clockevents.c

+0 −3
Original line number Diff line number Diff line
@@ -645,7 +645,6 @@ void clockevents_resume(void) 
			dev->resume(dev);

}



#ifdef CONFIG_GENERIC_CLOCKEVENTS

/**

 * clockevents_notify - notification about relevant events

 * Returns 0 on success, any other value on error
@@ -831,5 +830,3 @@ static int __init clockevents_init_sysfs(void) 
}

device_initcall(clockevents_init_sysfs);

#endif /* SYSFS */
 


#endif /* GENERIC_CLOCK_EVENTS */

kernel/time/tick-internal.h

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ extern seqlock_t jiffies_lock; 


#define CS_NAME_LEN	32



#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD

#ifdef CONFIG_GENERIC_CLOCKEVENTS



#define TICK_DO_TIMER_NONE	-1

#define TICK_DO_TIMER_BOOT	-2
@@ -167,7 +167,7 @@ static inline int tick_device_is_functional(struct clock_event_device *dev) 


int __clockevents_update_freq(struct clock_event_device *dev, u32 freq);



#endif

#endif /* GENERIC_CLOCKEVENTS */



extern void do_timer(unsigned long ticks);

extern void update_wall_time(void);