diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 12:40:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 12:40:26 -0400 |
| commit | f8b71a3a92d69cb1c9c2162f9235d3dd550e4aa0 (patch) | |
| tree | d0853186f33314a6e45903876d0e94d1619fcca9 /include/asm-sparc/ipcbuf.h | |
| parent | 42a77a1b8fe4fd78cf8d8fccbaac918bbe888192 (diff) | |
| parent | e4f25060b87a627f5cda84b8134911d43c919458 (diff) | |
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: (44 commits)
sparc: Remove Sparc's asm-offsets for sclow.S
sparc64: Update defconfig.
sparc64: Add Niagara2 RNG driver.
sparc64: Add missing hypervisor service group numbers.
sparc64: Remove 4MB and 512K base page size options.
sparc64: Convert to generic helpers for IPI function calls.
sparc: Use new '%pS' infrastructure to print symbols.
sparc32: fix init.c allnoconfig build error
sparc64: Config category "Processor type and features" absent
sparc: arch/sparc/kernel/apc.c to unlocked_ioctl
sparc: join the remaining header files
sparc: merge header files with trivial differences
sparc: when header files are equal use asm-sparc version
sparc: copy sparc64 specific files to asm-sparc
sparc: Merge asm-sparc{,64}/asi.h
sparc: export openprom.h to userspace
sparc: Merge asm-sparc{,64}/types.h
sparc: Merge asm-sparc{,64}/termios.h
sparc: Merge asm-sparc{,64}/termbits.h
sparc: Merge asm-sparc{,64}/setup.h
...
Diffstat (limited to 'include/asm-sparc/ipcbuf.h')
| -rw-r--r-- | include/asm-sparc/ipcbuf.h | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/include/asm-sparc/ipcbuf.h b/include/asm-sparc/ipcbuf.h index 9bef02d04e4b..037605d986e2 100644 --- a/include/asm-sparc/ipcbuf.h +++ b/include/asm-sparc/ipcbuf.h | |||
| @@ -1,31 +1,8 @@ | |||
| 1 | #ifndef _SPARC_IPCBUF_H | 1 | #ifndef ___ASM_SPARC_IPCBUF_H |
| 2 | #define _SPARC_IPCBUF_H | 2 | #define ___ASM_SPARC_IPCBUF_H |
| 3 | 3 | #if defined(__sparc__) && defined(__arch64__) | |
| 4 | /* | 4 | #include <asm-sparc/ipcbuf_64.h> |
| 5 | * The ipc64_perm structure for sparc architecture. | 5 | #else |
| 6 | * Note extra padding because this structure is passed back and forth | 6 | #include <asm-sparc/ipcbuf_32.h> |
| 7 | * between kernel and user space. | 7 | #endif |
| 8 | * | 8 | #endif |
| 9 | * Pad space is left for: | ||
| 10 | * - 32-bit mode | ||
| 11 | * - 32-bit seq | ||
| 12 | * - 2 miscellaneous 64-bit values (so that this structure matches | ||
| 13 | * sparc64 ipc64_perm) | ||
| 14 | */ | ||
| 15 | |||
| 16 | struct ipc64_perm | ||
| 17 | { | ||
| 18 | __kernel_key_t key; | ||
| 19 | __kernel_uid32_t uid; | ||
| 20 | __kernel_gid32_t gid; | ||
| 21 | __kernel_uid32_t cuid; | ||
| 22 | __kernel_gid32_t cgid; | ||
| 23 | unsigned short __pad1; | ||
| 24 | __kernel_mode_t mode; | ||
| 25 | unsigned short __pad2; | ||
| 26 | unsigned short seq; | ||
| 27 | unsigned long long __unused1; | ||
| 28 | unsigned long long __unused2; | ||
| 29 | }; | ||
| 30 | |||
| 31 | #endif /* _SPARC_IPCBUF_H */ | ||