diff options
Diffstat (limited to 'arch/cris/include')
-rw-r--r-- | arch/cris/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/cris/include/asm/processor.h | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/signal.h | 6 | ||||
-rw-r--r-- | arch/cris/include/asm/unistd.h | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 6d43a951b5ec..15a122c3767c 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild | |||
@@ -11,3 +11,4 @@ header-y += sync_serial.h | |||
11 | generic-y += clkdev.h | 11 | generic-y += clkdev.h |
12 | generic-y += exec.h | 12 | generic-y += exec.h |
13 | generic-y += module.h | 13 | generic-y += module.h |
14 | generic-y += trace_clock.h | ||
diff --git a/arch/cris/include/asm/processor.h b/arch/cris/include/asm/processor.h index ef4e1bc3efc8..675823f70c0f 100644 --- a/arch/cris/include/asm/processor.h +++ b/arch/cris/include/asm/processor.h | |||
@@ -49,8 +49,6 @@ struct task_struct; | |||
49 | #define task_pt_regs(task) user_regs(task_thread_info(task)) | 49 | #define task_pt_regs(task) user_regs(task_thread_info(task)) |
50 | #define current_regs() task_pt_regs(current) | 50 | #define current_regs() task_pt_regs(current) |
51 | 51 | ||
52 | extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); | ||
53 | |||
54 | unsigned long get_wchan(struct task_struct *p); | 52 | unsigned long get_wchan(struct task_struct *p); |
55 | 53 | ||
56 | #define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp) | 54 | #define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp) |
diff --git a/arch/cris/include/asm/signal.h b/arch/cris/include/asm/signal.h index ea6af9aad76c..72dbbf59dfae 100644 --- a/arch/cris/include/asm/signal.h +++ b/arch/cris/include/asm/signal.h | |||
@@ -152,12 +152,6 @@ typedef struct sigaltstack { | |||
152 | 152 | ||
153 | #ifdef __KERNEL__ | 153 | #ifdef __KERNEL__ |
154 | #include <asm/sigcontext.h> | 154 | #include <asm/sigcontext.h> |
155 | |||
156 | /* here we could define asm-optimized sigaddset, sigdelset etc. operations. | ||
157 | * if we don't, generic ones are used from linux/signal.h | ||
158 | */ | ||
159 | #define ptrace_signal_deliver(regs, cookie) do { } while (0) | ||
160 | |||
161 | #endif /* __KERNEL__ */ | 155 | #endif /* __KERNEL__ */ |
162 | 156 | ||
163 | #endif | 157 | #endif |
diff --git a/arch/cris/include/asm/unistd.h b/arch/cris/include/asm/unistd.h index 51873a446f87..f27b542e0ebc 100644 --- a/arch/cris/include/asm/unistd.h +++ b/arch/cris/include/asm/unistd.h | |||
@@ -371,6 +371,10 @@ | |||
371 | #define __ARCH_WANT_SYS_SIGPROCMASK | 371 | #define __ARCH_WANT_SYS_SIGPROCMASK |
372 | #define __ARCH_WANT_SYS_RT_SIGACTION | 372 | #define __ARCH_WANT_SYS_RT_SIGACTION |
373 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | 373 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |
374 | #define __ARCH_WANT_SYS_EXECVE | ||
375 | #define __ARCH_WANT_SYS_FORK | ||
376 | #define __ARCH_WANT_SYS_VFORK | ||
377 | #define __ARCH_WANT_SYS_CLONE | ||
374 | 378 | ||
375 | /* | 379 | /* |
376 | * "Conditional" syscalls | 380 | * "Conditional" syscalls |