mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
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().
This commit is contained in:
commit
85b80ebfa4
12 changed files with 34 additions and 84 deletions
|
|
@ -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__ */
|
||||
|
|
|
|||
6
include/asm-sparc64/reboot.h
Normal file
6
include/asm-sparc64/reboot.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _SPARC64_REBOOT_H
|
||||
#define _SPARC64_REBOOT_H
|
||||
|
||||
extern void machine_alt_power_off(void);
|
||||
|
||||
#endif /* _SPARC64_REBOOT_H */
|
||||
13
include/asm-sparc64/syscalls.h
Normal file
13
include/asm-sparc64/syscalls.h
Normal file
|
|
@ -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 */
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue