diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-04 09:26:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-04 09:26:44 -0700 |
| commit | 190045d53b9a8341e8600d6eb468b6081e903afb (patch) | |
| tree | b0fb0e19223f5e293f9fe3028dcac027d9934c47 /include/asm-mips/ptrace.h | |
| parent | e2baf4ed168589af8224d51f0ac50e65bcdee3f6 (diff) | |
| parent | 8c976e34516c9e134488babbb95af182340370c8 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] VSMP: Fix initialization ordering bug.
[MIPS] Add whitelists for checksyscalls.sh
[MIPS] die(): Properly declare as non-returning
[MIPS] Fix include wrapper symbol definitions in IP32 code.
Diffstat (limited to 'include/asm-mips/ptrace.h')
| -rw-r--r-- | include/asm-mips/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h index 1906938285c..85b44366343 100644 --- a/include/asm-mips/ptrace.h +++ b/include/asm-mips/ptrace.h @@ -86,7 +86,7 @@ struct pt_regs { extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit); -extern NORET_TYPE void die(const char *, struct pt_regs *); +extern NORET_TYPE void die(const char *, struct pt_regs *) ATTRIB_NORET; static inline void die_if_kernel(const char *str, struct pt_regs *regs) { |