diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:42 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:42 -0500 |
| commit | 42472a742beef91508d1745ba2d40d96337e8f0f (patch) | |
| tree | 21103084dc19167cc1e3c94354fd01908b701dd1 /arch/hexagon/include/asm | |
| parent | 94b237b6b9d8e2afa304108b9387be67e878f3bc (diff) | |
| parent | 27aedbd52fb78bbead55c81a8dd906afd405c3fc (diff) | |
Merge branch 'arch-hexagon' into no-rebases
Diffstat (limited to 'arch/hexagon/include/asm')
| -rw-r--r-- | arch/hexagon/include/asm/processor.h | 1 | ||||
| -rw-r--r-- | arch/hexagon/include/asm/ptrace.h | 4 | ||||
| -rw-r--r-- | arch/hexagon/include/asm/unistd.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/processor.h b/arch/hexagon/include/asm/processor.h index e8ea459002a4..8483b49de036 100644 --- a/arch/hexagon/include/asm/processor.h +++ b/arch/hexagon/include/asm/processor.h | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | struct task_struct; | 34 | struct task_struct; |
| 35 | 35 | ||
| 36 | /* this is defined in arch/process.c */ | 36 | /* this is defined in arch/process.c */ |
| 37 | extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); | ||
| 38 | extern unsigned long thread_saved_pc(struct task_struct *tsk); | 37 | extern unsigned long thread_saved_pc(struct task_struct *tsk); |
| 39 | 38 | ||
| 40 | extern void start_thread(struct pt_regs *, unsigned long, unsigned long); | 39 | extern void start_thread(struct pt_regs *, unsigned long, unsigned long); |
diff --git a/arch/hexagon/include/asm/ptrace.h b/arch/hexagon/include/asm/ptrace.h index 3d2f607cd63c..7e1e3745cb8a 100644 --- a/arch/hexagon/include/asm/ptrace.h +++ b/arch/hexagon/include/asm/ptrace.h | |||
| @@ -32,4 +32,8 @@ | |||
| 32 | extern int regs_query_register_offset(const char *name); | 32 | extern int regs_query_register_offset(const char *name); |
| 33 | extern const char *regs_query_register_name(unsigned int offset); | 33 | extern const char *regs_query_register_name(unsigned int offset); |
| 34 | 34 | ||
| 35 | #define current_pt_regs() \ | ||
| 36 | ((struct pt_regs *) \ | ||
| 37 | ((unsigned long)current_thread_info() + THREAD_SIZE) - 1) | ||
| 38 | |||
| 35 | #endif | 39 | #endif |
diff --git a/arch/hexagon/include/asm/unistd.h b/arch/hexagon/include/asm/unistd.h index c0d5565030ae..acbd5adc9814 100644 --- a/arch/hexagon/include/asm/unistd.h +++ b/arch/hexagon/include/asm/unistd.h | |||
| @@ -27,5 +27,6 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #define sys_mmap2 sys_mmap_pgoff | 29 | #define sys_mmap2 sys_mmap_pgoff |
| 30 | #define __ARCH_WANT_SYS_EXECVE | ||
| 30 | 31 | ||
| 31 | #include <asm-generic/unistd.h> | 32 | #include <asm-generic/unistd.h> |