diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/arm26/kernel | |
parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/arm26/kernel')
-rw-r--r-- | arch/arm26/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/arm26/kernel/time.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm26/kernel/ptrace.c b/arch/arm26/kernel/ptrace.c index 8a52124de0e1..cf7e977d18c8 100644 --- a/arch/arm26/kernel/ptrace.c +++ b/arch/arm26/kernel/ptrace.c | |||
@@ -665,7 +665,7 @@ static int do_ptrace(int request, struct task_struct *child, long addr, long dat | |||
665 | return ret; | 665 | return ret; |
666 | } | 666 | } |
667 | 667 | ||
668 | asmlinkage int sys_ptrace(long request, long pid, long addr, long data) | 668 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
669 | { | 669 | { |
670 | struct task_struct *child; | 670 | struct task_struct *child; |
671 | int ret; | 671 | int ret; |
diff --git a/arch/arm26/kernel/time.c b/arch/arm26/kernel/time.c index e66aedd02fad..335525339ad6 100644 --- a/arch/arm26/kernel/time.c +++ b/arch/arm26/kernel/time.c | |||
@@ -34,10 +34,6 @@ | |||
34 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
35 | #include <asm/ioc.h> | 35 | #include <asm/ioc.h> |
36 | 36 | ||
37 | u64 jiffies_64 = INITIAL_JIFFIES; | ||
38 | |||
39 | EXPORT_SYMBOL(jiffies_64); | ||
40 | |||
41 | extern unsigned long wall_jiffies; | 37 | extern unsigned long wall_jiffies; |
42 | 38 | ||
43 | /* this needs a better home */ | 39 | /* this needs a better home */ |