diff options
Diffstat (limited to 'arch/xtensa')
-rw-r--r-- | arch/xtensa/kernel/platform.c | 1 | ||||
-rw-r--r-- | arch/xtensa/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/xtensa/kernel/time.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c index 03674daabc66..a17930747f20 100644 --- a/arch/xtensa/kernel/platform.c +++ b/arch/xtensa/kernel/platform.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/time.h> | 18 | #include <linux/time.h> |
19 | #include <asm/platform.h> | 19 | #include <asm/platform.h> |
20 | #include <asm/timex.h> | 20 | #include <asm/timex.h> |
21 | #include <asm/param.h> /* HZ */ | ||
21 | 22 | ||
22 | #define _F(r,f,a,b) \ | 23 | #define _F(r,f,a,b) \ |
23 | r __platform_##f a b; \ | 24 | r __platform_##f a b; \ |
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c index 2659efdd4e99..14460743de07 100644 --- a/arch/xtensa/kernel/ptrace.c +++ b/arch/xtensa/kernel/ptrace.c | |||
@@ -45,7 +45,7 @@ void ptrace_disable(struct task_struct *child) | |||
45 | /* Nothing to do.. */ | 45 | /* Nothing to do.. */ |
46 | } | 46 | } |
47 | 47 | ||
48 | int sys_ptrace(long request, long pid, long addr, long data) | 48 | long sys_ptrace(long request, long pid, long addr, long data) |
49 | { | 49 | { |
50 | struct task_struct *child; | 50 | struct task_struct *child; |
51 | int ret = -EPERM; | 51 | int ret = -EPERM; |
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index 8e423d1335ce..cb6e38ed2b1d 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c | |||
@@ -29,9 +29,6 @@ | |||
29 | 29 | ||
30 | extern volatile unsigned long wall_jiffies; | 30 | extern volatile unsigned long wall_jiffies; |
31 | 31 | ||
32 | u64 jiffies_64 = INITIAL_JIFFIES; | ||
33 | EXPORT_SYMBOL(jiffies_64); | ||
34 | |||
35 | spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; | 32 | spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; |
36 | EXPORT_SYMBOL(rtc_lock); | 33 | EXPORT_SYMBOL(rtc_lock); |
37 | 34 | ||