diff options
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/time.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index 8ed1b01a6a87..f7f1d2e5b90b 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c | |||
@@ -121,7 +121,7 @@ void ptrace_disable(struct task_struct *child) | |||
121 | child->thread.work.syscall_trace = 0; | 121 | child->thread.work.syscall_trace = 0; |
122 | } | 122 | } |
123 | 123 | ||
124 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 124 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
125 | { | 125 | { |
126 | struct task_struct *child; | 126 | struct task_struct *child; |
127 | unsigned long tmp; | 127 | unsigned long tmp; |
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 4ec95e3cb874..98e4b1adfa29 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c | |||
@@ -27,10 +27,6 @@ | |||
27 | #include <linux/timex.h> | 27 | #include <linux/timex.h> |
28 | #include <linux/profile.h> | 28 | #include <linux/profile.h> |
29 | 29 | ||
30 | u64 jiffies_64 = INITIAL_JIFFIES; | ||
31 | |||
32 | EXPORT_SYMBOL(jiffies_64); | ||
33 | |||
34 | static inline int set_rtc_mmss(unsigned long nowtime) | 30 | static inline int set_rtc_mmss(unsigned long nowtime) |
35 | { | 31 | { |
36 | if (mach_set_clock_mmss) | 32 | if (mach_set_clock_mmss) |