diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 15:48:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 15:48:06 -0500 |
| commit | b0138a6cb7923a997d278b47c176778534d1095b (patch) | |
| tree | 4fcb8822a69631baba568e4e1942847747123887 /include/asm-parisc/msgbuf.h | |
| parent | 6572d6d7d0f965dda19d02af804ed3ae4b3bf1fc (diff) | |
| parent | 1055a8af093fea7490445bd15cd671020e542035 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (78 commits)
[PARISC] Use symbolic last syscall in __NR_Linux_syscalls
[PARISC] Add missing statfs64 and fstatfs64 syscalls
Revert "[PARISC] Optimize TLB flush on SMP systems"
[PARISC] Compat signal fixes for 64-bit parisc
[PARISC] Reorder syscalls to match unistd.h
Revert "[PATCH] make kernel/signal.c:kill_proc_info() static"
[PARISC] fix sys_rt_sigqueueinfo
[PARISC] fix section mismatch warnings in harmony sound driver
[PARISC] do not export get_register/set_register
[PARISC] add ENTRY()/ENDPROC() and simplify assembly of HP/UX emulation code
[PARISC] convert to use CONFIG_64BIT instead of __LP64__
[PARISC] use CONFIG_64BIT instead of __LP64__
[PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro
[PARISC] more ENTRY(), ENDPROC(), END() conversions
[PARISC] fix ENTRY() and ENDPROC() for 64bit-parisc
[PARISC] Fixes /proc/cpuinfo cache output on B160L
[PARISC] implement standard ENTRY(), END() and ENDPROC()
[PARISC] kill ENTRY_SYS_CPUS
[PARISC] clean up debugging printks in smp.c
[PARISC] factor syscall_restart code out of do_signal
...
Fix conflict in include/linux/sched.h due to kill_proc_info() being made
publicly available to PARISC again.
Diffstat (limited to 'include/asm-parisc/msgbuf.h')
| -rw-r--r-- | include/asm-parisc/msgbuf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-parisc/msgbuf.h b/include/asm-parisc/msgbuf.h index 14ffc2782f1e..fe88f2649418 100644 --- a/include/asm-parisc/msgbuf.h +++ b/include/asm-parisc/msgbuf.h | |||
| @@ -13,15 +13,15 @@ | |||
| 13 | 13 | ||
| 14 | struct msqid64_ds { | 14 | struct msqid64_ds { |
| 15 | struct ipc64_perm msg_perm; | 15 | struct ipc64_perm msg_perm; |
| 16 | #ifndef __LP64__ | 16 | #ifndef CONFIG_64BIT |
| 17 | unsigned int __pad1; | 17 | unsigned int __pad1; |
| 18 | #endif | 18 | #endif |
| 19 | __kernel_time_t msg_stime; /* last msgsnd time */ | 19 | __kernel_time_t msg_stime; /* last msgsnd time */ |
| 20 | #ifndef __LP64__ | 20 | #ifndef CONFIG_64BIT |
| 21 | unsigned int __pad2; | 21 | unsigned int __pad2; |
| 22 | #endif | 22 | #endif |
| 23 | __kernel_time_t msg_rtime; /* last msgrcv time */ | 23 | __kernel_time_t msg_rtime; /* last msgrcv time */ |
| 24 | #ifndef __LP64__ | 24 | #ifndef CONFIG_64BIT |
| 25 | unsigned int __pad3; | 25 | unsigned int __pad3; |
| 26 | #endif | 26 | #endif |
| 27 | __kernel_time_t msg_ctime; /* last change time */ | 27 | __kernel_time_t msg_ctime; /* last change time */ |