Skip to content

Commit

Permalink
um: Move timer-internal.h to non-shared
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
Johannes Berg authored and Richard Weinberger committed Mar 29, 2020
1 parent b58c4e9 commit f185063
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 4 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion arch/um/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/um/kernel/skas/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion arch/um/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/um/os-Linux/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit f185063

Please sign in to comment.