diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 11:06:46 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 11:06:46 +0100 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /arch/sh64 | |
| parent | Merge branch 'master' of /usr/src/ntfs-2.6/ (diff) | |
| parent | powerpc: import a fix from arch/ppc/mm/pgtable.c (diff) | |
| download | linux-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.xz linux-1f04c0a24b2f3cfe89c802a24396263623e3512d.zip | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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) return 0; } -asmlinkage int sys_ptrace(long request, long pid, long addr, long data) +asmlinkage long sys_ptrace(long request, long pid, long addr, long data) { struct task_struct *child; 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 @@ extern unsigned long wall_jiffies; -u64 jiffies_64 = INITIAL_JIFFIES; - static unsigned long tmu_base, rtc_base; unsigned long cprc_base; |