| Message ID | 1568639159-Iae380466e34ef64cede349e6bd6eeb7854230d1a@changeid |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | um: move timer-internal.h to non-shared | expand |
On 16/09/2019 14:05, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > This file isn't really shared, it's only used on the kernel side, > not on the user side. Remove the include from the user-side and > move the file to a better place. > > While at it, rename it to time-internal.h, it's not really just > timers but all kinds of things related to timekeeping. > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > .../include/{shared/timer-internal.h => linux/time-internal.h} | 0 > arch/um/kernel/process.c | 2 +- > arch/um/kernel/skas/syscall.c | 2 +- > arch/um/kernel/time.c | 2 +- > arch/um/os-Linux/time.c | 1 - > 5 files changed, 3 insertions(+), 4 deletions(-) > rename arch/um/include/{shared/timer-internal.h => linux/time-internal.h} (100%) > > diff --git a/arch/um/include/shared/timer-internal.h b/arch/um/include/linux/time-internal.h > similarity index 100% > rename from arch/um/include/shared/timer-internal.h > rename to arch/um/include/linux/time-internal.h > diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c > index 263a8f069133..201ca2b4c758 100644 > --- a/arch/um/kernel/process.c > +++ b/arch/um/kernel/process.c > @@ -32,7 +32,7 @@ > #include <kern_util.h> > #include <os.h> > #include <skas.h> > -#include <timer-internal.h> > +#include <linux/time-internal.h> > > /* > * This is a per-cpu array. A processor only modifies its entry and it only > diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c > index f574b1856bc6..58d40fe4f1aa 100644 > --- a/arch/um/kernel/skas/syscall.c > +++ b/arch/um/kernel/skas/syscall.c > @@ -10,7 +10,7 @@ > #include <sysdep/ptrace.h> > #include <sysdep/ptrace_user.h> > #include <sysdep/syscalls.h> > -#include <shared/timer-internal.h> > +#include <linux/time-internal.h> > > void handle_syscall(struct uml_pt_regs *r) > { > diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c > index 94ea87bd231c..a849d391e909 100644 > --- a/arch/um/kernel/time.c > +++ b/arch/um/kernel/time.c > @@ -18,7 +18,7 @@ > #include <asm/param.h> > #include <kern_util.h> > #include <os.h> > -#include <timer-internal.h> > +#include <linux/time-internal.h> > #include <shared/init.h> > > #ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT > diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c > index 432f8e1f55c2..90f6de224c70 100644 > --- a/arch/um/os-Linux/time.c > +++ b/arch/um/os-Linux/time.c > @@ -14,7 +14,6 @@ > #include <kern_util.h> > #include <os.h> > #include <string.h> > -#include <timer-internal.h> > > static timer_t event_high_res_timer = 0; > > Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.co.uk>
diff --git a/arch/um/include/shared/timer-internal.h b/arch/um/include/linux/time-internal.h similarity index 100% rename from arch/um/include/shared/timer-internal.h rename to arch/um/include/linux/time-internal.h diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 263a8f069133..201ca2b4c758 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -32,7 +32,7 @@ #include <kern_util.h> #include <os.h> #include <skas.h> -#include <timer-internal.h> +#include <linux/time-internal.h> /* * This is a per-cpu array. A processor only modifies its entry and it only diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c index f574b1856bc6..58d40fe4f1aa 100644 --- a/arch/um/kernel/skas/syscall.c +++ b/arch/um/kernel/skas/syscall.c @@ -10,7 +10,7 @@ #include <sysdep/ptrace.h> #include <sysdep/ptrace_user.h> #include <sysdep/syscalls.h> -#include <shared/timer-internal.h> +#include <linux/time-internal.h> void handle_syscall(struct uml_pt_regs *r) { diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 94ea87bd231c..a849d391e909 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -18,7 +18,7 @@ #include <asm/param.h> #include <kern_util.h> #include <os.h> -#include <timer-internal.h> +#include <linux/time-internal.h> #include <shared/init.h> #ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index 432f8e1f55c2..90f6de224c70 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c @@ -14,7 +14,6 @@ #include <kern_util.h> #include <os.h> #include <string.h> -#include <timer-internal.h> static timer_t event_high_res_timer = 0;