diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:43:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:43:02 -0800 |
| commit | de29cba9c9bb2dc35803e8d5c968a454e297b8f3 (patch) | |
| tree | 1e4d0e1150b5ae2bea9a5810bec97d18d07644c5 /include | |
| parent | 104064b54955addac0fcf9ceb6c68569f2bed6ab (diff) | |
| parent | e6e0a94573fb33e6e62b848a24864e6864c45464 (diff) | |
| download | linux-de29cba9c9bb2dc35803e8d5c968a454e297b8f3.tar.gz linux-de29cba9c9bb2dc35803e8d5c968a454e297b8f3.tar.bz2 linux-de29cba9c9bb2dc35803e8d5c968a454e297b8f3.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:
[SPARC32]: Silence sparc32 warnings on missing syscalls.
[SPARC64]: Fix two kernel linear mapping setup bugs.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/unistd.h | 9 | ||||
| -rw-r--r-- | include/asm-sparc64/hypervisor.h | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 029b3e0d5e4c..0decdf763716 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h @@ -333,6 +333,15 @@ #define NR_SYSCALLS 315 +/* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, + * it never had the plain ones and there is no value to adding those + * old versions into the syscall table. + */ +#define __IGNORE_setresuid +#define __IGNORE_getresuid +#define __IGNORE_setresgid +#define __IGNORE_getresgid + #ifdef __KERNEL__ #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h index 524d49835dfd..3ad45dff52f8 100644 --- a/include/asm-sparc64/hypervisor.h +++ b/include/asm-sparc64/hypervisor.h @@ -709,6 +709,10 @@ extern unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions, */ #define HV_FAST_MMU_DEMAP_ALL 0x24 +#ifndef __ASSEMBLY__ +extern void sun4v_mmu_demap_all(void); +#endif + /* mmu_map_perm_addr() * TRAP: HV_FAST_TRAP * FUNCTION: HV_FAST_MMU_MAP_PERM_ADDR |