diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:13:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:13:16 -0400 |
| commit | d20ead9e86881bc7ae84e385f47b5196b7d93aac (patch) | |
| tree | ed27dd5db5f8447e4b3f541f0ec38219085d2f32 /include/asm-x86/sembuf.h | |
| parent | c56ec7639288f3e5d6371b0c48d37da93642fc93 (diff) | |
| parent | 88e4d250234fc9e64d6ce51df95efdcf8334fd95 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
x86: delete vsyscall files during make clean
kbuild: fix typo SRCARCH in find_sources
x86: fix kernel rebuild due to vsyscall fallout
.gitignore update for x86 arch
x86: unify include/asm/debugreg_32/64.h
x86: unify include/asm/unwind_32/64.h
x86: unify include/asm/types_32/64.h
x86: unify include/asm/tlb_32/64.h
x86: unify include/asm/siginfo_32/64.h
x86: unify include/asm/bug_32/64.h
x86: unify include/asm/mman_32/64.h
x86: unify include/asm/agp_32/64.h
x86: unify include/asm/kdebug_32/64.h
x86: unify include/asm/ioctls_32/64.h
x86: unify include/asm/floppy_32/64.h
x86: apply missing DMA/OOM prevention to floppy_32.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/dmi_32/64.h
x86: unify include/asm/delay_32/64.h
...
Diffstat (limited to 'include/asm-x86/sembuf.h')
| -rw-r--r-- | include/asm-x86/sembuf.h | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/include/asm-x86/sembuf.h b/include/asm-x86/sembuf.h index e42c971e383f..ee50c801f7b7 100644 --- a/include/asm-x86/sembuf.h +++ b/include/asm-x86/sembuf.h | |||
| @@ -1,13 +1,24 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifndef _ASM_X86_SEMBUF_H |
| 2 | # ifdef CONFIG_X86_32 | 2 | #define _ASM_X86_SEMBUF_H |
| 3 | # include "sembuf_32.h" | 3 | |
| 4 | # else | 4 | /* |
| 5 | # include "sembuf_64.h" | 5 | * The semid64_ds structure for x86 architecture. |
| 6 | # endif | 6 | * Note extra padding because this structure is passed back and forth |
| 7 | #else | 7 | * between kernel and user space. |
| 8 | # ifdef __i386__ | 8 | * |
| 9 | # include "sembuf_32.h" | 9 | * Pad space is left for: |
| 10 | # else | 10 | * - 64-bit time_t to solve y2038 problem |
| 11 | # include "sembuf_64.h" | 11 | * - 2 miscellaneous 32-bit values |
| 12 | # endif | 12 | */ |
| 13 | #endif | 13 | struct semid64_ds { |
| 14 | struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ | ||
| 15 | __kernel_time_t sem_otime; /* last semop time */ | ||
| 16 | unsigned long __unused1; | ||
| 17 | __kernel_time_t sem_ctime; /* last change time */ | ||
| 18 | unsigned long __unused2; | ||
| 19 | unsigned long sem_nsems; /* no. of semaphores in array */ | ||
| 20 | unsigned long __unused3; | ||
| 21 | unsigned long __unused4; | ||
| 22 | }; | ||
| 23 | |||
| 24 | #endif /* _ASM_X86_SEMBUF_H */ | ||