diff options
Diffstat (limited to 'arch/sh64')
-rw-r--r-- | arch/sh64/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/sh64/kernel/time.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh64/kernel/ptrace.c b/arch/sh64/kernel/ptrace.c index fd2000956dae..71f2eec00b99 100644 --- a/arch/sh64/kernel/ptrace.c +++ b/arch/sh64/kernel/ptrace.c | |||
@@ -121,7 +121,7 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data) | |||
121 | return 0; | 121 | return 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 | extern void poke_real_address_q(unsigned long long addr, unsigned long long data); | 127 | extern void poke_real_address_q(unsigned long long addr, unsigned long long data); |
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c index 43e395a14f49..870fe5327e09 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh64/kernel/time.c | |||
@@ -116,8 +116,6 @@ | |||
116 | 116 | ||
117 | extern unsigned long wall_jiffies; | 117 | extern unsigned long wall_jiffies; |
118 | 118 | ||
119 | u64 jiffies_64 = INITIAL_JIFFIES; | ||
120 | |||
121 | static unsigned long tmu_base, rtc_base; | 119 | static unsigned long tmu_base, rtc_base; |
122 | unsigned long cprc_base; | 120 | unsigned long cprc_base; |
123 | 121 | ||