diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 21:00:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 21:00:21 -0800 |
| commit | 85b80ebfa4384b8ea30cc1af9617db30319a9ccd (patch) | |
| tree | d601c0faf36b0ca4cda607ecfec892c73ca41bc1 /include | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
| parent | 89c94f2f70d093f59b55d3ea8042d13889169346 (diff) | |
| download | linux-3.10-85b80ebfa4384b8ea30cc1af9617db30319a9ccd.tar.gz linux-3.10-85b80ebfa4384b8ea30cc1af9617db30319a9ccd.tar.bz2 linux-3.10-85b80ebfa4384b8ea30cc1af9617db30319a9ccd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: make IOMMU code respect the segment boundary limits
[SPARC64]: Fix cpu trampoline et al. mismatch warnings.
[SPARC64]: More sparse warning fixes in process.c
[SPARC64]: Fix sparse warning wrt. fault_in_user_windows.
[SPARC64]: Kill show_regs32().
[SPARC64]: Fix sparse warnings wrt. __show_regs().
[SPARC64]: Kill show_stackframe{,32}().
[SPARC64]: Fix sparse warnings wrt. machine_alt_power_off().
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/ptrace.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc64/reboot.h | 6 | ||||
| -rw-r--r-- | include/asm-sparc64/syscalls.h | 13 | ||||
| -rw-r--r-- | include/asm-sparc64/system.h | 1 |
4 files changed, 21 insertions, 0 deletions
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h index 67341cff2e6..6da197803ef 100644 --- a/include/asm-sparc64/ptrace.h +++ b/include/asm-sparc64/ptrace.h @@ -109,6 +109,7 @@ extern unsigned long profile_pc(struct pt_regs *); #define profile_pc(regs) instruction_pointer(regs) #endif extern void show_regs(struct pt_regs *); +extern void __show_regs(struct pt_regs *); #endif #else /* __ASSEMBLY__ */ diff --git a/include/asm-sparc64/reboot.h b/include/asm-sparc64/reboot.h new file mode 100644 index 00000000000..3f3f43f5be5 --- /dev/null +++ b/include/asm-sparc64/reboot.h @@ -0,0 +1,6 @@ +#ifndef _SPARC64_REBOOT_H +#define _SPARC64_REBOOT_H + +extern void machine_alt_power_off(void); + +#endif /* _SPARC64_REBOOT_H */ diff --git a/include/asm-sparc64/syscalls.h b/include/asm-sparc64/syscalls.h new file mode 100644 index 00000000000..45a43f637a1 --- /dev/null +++ b/include/asm-sparc64/syscalls.h @@ -0,0 +1,13 @@ +#ifndef _SPARC64_SYSCALLS_H +#define _SPARC64_SYSCALLS_H + +struct pt_regs; + +extern asmlinkage long sparc_do_fork(unsigned long clone_flags, + unsigned long stack_start, + struct pt_regs *regs, + unsigned long stack_size); + +extern asmlinkage int sparc_execve(struct pt_regs *regs); + +#endif /* _SPARC64_SYSCALLS_H */ diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h index 1faefa6d370..ed91a5d8d4f 100644 --- a/include/asm-sparc64/system.h +++ b/include/asm-sparc64/system.h @@ -117,6 +117,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \ extern void sun_do_break(void); extern int stop_a_enabled; +extern void fault_in_user_windows(void); extern void synchronize_user_stack(void); extern void __flushw_user(void); |