diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-04 18:26:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-04 18:26:44 +0200 |
| commit | 190045d53b9a8341e8600d6eb468b6081e903afb (patch) | |
| tree | b0fb0e19223f5e293f9fe3028dcac027d9934c47 /include | |
| parent | [JFFS2] Fix readinode failure when read_dnode() detects CRC failure. (diff) | |
| parent | [MIPS] VSMP: Fix initialization ordering bug. (diff) | |
| download | linux-190045d53b9a8341e8600d6eb468b6081e903afb.tar.xz linux-190045d53b9a8341e8600d6eb468b6081e903afb.zip | |
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 '')
| -rw-r--r-- | include/asm-mips/mach-ip32/dma-coherence.h | 6 | ||||
| -rw-r--r-- | include/asm-mips/ptrace.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/unistd.h | 16 |
3 files changed, 20 insertions, 4 deletions
diff --git a/include/asm-mips/mach-ip32/dma-coherence.h b/include/asm-mips/mach-ip32/dma-coherence.h index c3f9a6a20eb0..a5511ebb2d53 100644 --- a/include/asm-mips/mach-ip32/dma-coherence.h +++ b/include/asm-mips/mach-ip32/dma-coherence.h @@ -6,8 +6,8 @@ * Copyright (C) 2006 Ralf Baechle <ralf@linux-mips.org> * */ -#ifndef __ASM_MACH_IP35_DMA_COHERENCE_H -#define __ASM_MACH_IP35_DMA_COHERENCE_H +#ifndef __ASM_MACH_IP32_DMA_COHERENCE_H +#define __ASM_MACH_IP32_DMA_COHERENCE_H #include <asm/ip32/crime.h> @@ -69,4 +69,4 @@ static inline int plat_device_is_coherent(struct device *dev) return 0; /* IP32 is non-cohernet */ } -#endif /* __ASM_MACH_IP35_DMA_COHERENCE_H */ +#endif /* __ASM_MACH_IP32_DMA_COHERENCE_H */ diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h index 1906938285c0..85b44366343a 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) { diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 59d6fec8fbff..ed16de0a6398 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h @@ -977,6 +977,22 @@ # define __ARCH_WANT_COMPAT_SYS_TIME # endif +/* whitelists for checksyscalls */ +#define __IGNORE_select +#define __IGNORE_vfork +#define __IGNORE_time +#define __IGNORE_uselib +#define __IGNORE_fadvise64_64 +#define __IGNORE_getdents64 +#if _MIPS_SIM == _MIPS_SIM_NABI32 +#define __IGNORE_truncate64 +#define __IGNORE_ftruncate64 +#define __IGNORE_stat64 +#define __IGNORE_lstat64 +#define __IGNORE_fstat64 +#define __IGNORE_fstatat64 +#endif + #endif /* !__ASSEMBLY__ */ /* |