diff options
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | kernel/Makefile | 25 | ||||
| -rw-r--r-- | kernel/time/Makefile | 17 | ||||
| -rw-r--r-- | kernel/time/hrtimer.c (renamed from kernel/hrtimer.c) | 0 | ||||
| -rw-r--r-- | kernel/time/itimer.c (renamed from kernel/itimer.c) | 0 | ||||
| -rw-r--r-- | kernel/time/posix-cpu-timers.c (renamed from kernel/posix-cpu-timers.c) | 0 | ||||
| -rw-r--r-- | kernel/time/posix-timers.c (renamed from kernel/posix-timers.c) | 0 | ||||
| -rw-r--r-- | kernel/time/time.c (renamed from kernel/time.c) | 0 | ||||
| -rw-r--r-- | kernel/time/timeconst.bc (renamed from kernel/timeconst.bc) | 0 | ||||
| -rw-r--r-- | kernel/time/timer.c (renamed from kernel/timer.c) | 0 |
10 files changed, 24 insertions, 24 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1b22565..970c4a0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4147,7 +4147,7 @@ L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core S: Maintained F: Documentation/timers/ -F: kernel/hrtimer.c +F: kernel/time/hrtimer.c F: kernel/time/clockevents.c F: kernel/time/tick*.* F: kernel/time/timer_*.c @@ -6945,10 +6945,10 @@ POSIX CLOCKS and TIMERS M: Thomas Gleixner <tglx@linutronix.de> L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core -S: Supported +S: Maintained F: fs/timerfd.c F: include/linux/timer* -F: kernel/*timer* +F: kernel/time/*timer* POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> diff --git a/kernel/Makefile b/kernel/Makefile index f2a8b62..973a40c 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -3,12 +3,11 @@ # obj-y = fork.o exec_domain.o panic.o \ - cpu.o exit.o itimer.o time.o softirq.o resource.o \ - sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \ + cpu.o exit.o softirq.o resource.o \ + sysctl.o sysctl_binary.o capability.o ptrace.o user.o \ signal.o sys.o kmod.o workqueue.o pid.o task_work.o \ - extable.o params.o posix-timers.o \ - kthread.o sys_ni.o posix-cpu-timers.o \ - hrtimer.o nsproxy.o \ + extable.o params.o \ + kthread.o sys_ni.o nsproxy.o \ notifier.o ksysfs.o cred.o reboot.o \ async.o range.o groups.o smpboot.o @@ -110,22 +109,6 @@ targets += config_data.h $(obj)/config_data.h: $(obj)/config_data.gz FORCE $(call filechk,ikconfiggz) -$(obj)/time.o: $(obj)/timeconst.h - -quiet_cmd_hzfile = HZFILE $@ - cmd_hzfile = echo "hz=$(CONFIG_HZ)" > $@ - -targets += hz.bc -$(obj)/hz.bc: $(objtree)/include/config/hz.h FORCE - $(call if_changed,hzfile) - -quiet_cmd_bc = BC $@ - cmd_bc = bc -q $(filter-out FORCE,$^) > $@ - -targets += timeconst.h -$(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE - $(call if_changed,bc) - ############################################################################### # # Roll all the X.509 certificates that we can find together and pull them into diff --git a/kernel/time/Makefile b/kernel/time/Makefile index 57a413f..e59ce8b 100644 --- a/kernel/time/Makefile +++ b/kernel/time/Makefile @@ -1,3 +1,4 @@ +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 posix-clock.o alarmtimer.o @@ -12,3 +13,19 @@ obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o obj-$(CONFIG_TICK_ONESHOT) += tick-sched.o obj-$(CONFIG_TIMER_STATS) += timer_stats.o obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o + +$(obj)/time.o: $(obj)/timeconst.h + +quiet_cmd_hzfile = HZFILE $@ + cmd_hzfile = echo "hz=$(CONFIG_HZ)" > $@ + +targets += hz.bc +$(obj)/hz.bc: $(objtree)/include/config/hz.h FORCE + $(call if_changed,hzfile) + +quiet_cmd_bc = BC $@ + cmd_bc = bc -q $(filter-out FORCE,$^) > $@ + +targets += timeconst.h +$(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE + $(call if_changed,bc) diff --git a/kernel/hrtimer.c b/kernel/time/hrtimer.c index 3ab2899..3ab2899 100644 --- a/kernel/hrtimer.c +++ b/kernel/time/hrtimer.c diff --git a/kernel/itimer.c b/kernel/time/itimer.c index 8d262b4..8d262b4 100644 --- a/kernel/itimer.c +++ b/kernel/time/itimer.c diff --git a/kernel/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 3b89464..3b89464 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c diff --git a/kernel/posix-timers.c b/kernel/time/posix-timers.c index 424c2d4..424c2d4 100644 --- a/kernel/posix-timers.c +++ b/kernel/time/posix-timers.c diff --git a/kernel/time.c b/kernel/time/time.c index 7c7964c..7c7964c 100644 --- a/kernel/time.c +++ b/kernel/time/time.c diff --git a/kernel/timeconst.bc b/kernel/time/timeconst.bc index 511bdf2..511bdf2 100644 --- a/kernel/timeconst.bc +++ b/kernel/time/timeconst.bc diff --git a/kernel/timer.c b/kernel/time/timer.c index 3bb01a3..3bb01a3 100644 --- a/kernel/timer.c +++ b/kernel/time/timer.c |
