git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
msg.h
diff --git
a/include/linux/msg.h
b/include/linux/msg.h
index
903e0ab
..
acc7c17
100644
(file)
--- a/
include/linux/msg.h
+++ b/
include/linux/msg.h
@@
-2,7
+2,6
@@
#define _LINUX_MSG_H
#include <linux/ipc.h>
#define _LINUX_MSG_H
#include <linux/ipc.h>
-#include <linux/list.h>
/* ipcs ctl commands */
#define MSG_STAT 11
/* ipcs ctl commands */
#define MSG_STAT 11
@@
-63,6
+62,7
@@
struct msginfo {
#define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
#ifdef __KERNEL__
#define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
#ifdef __KERNEL__
+#include <linux/list.h>
/* one msg_msg structure for each message */
struct msg_msg {
/* one msg_msg structure for each message */
struct msg_msg {