diff options
| author | Paul Mackerras <paulus@samba.org> | 2003-01-02 08:01:36 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2003-01-02 08:01:36 +1100 |
| commit | 52daa1f418d104420b8e3cf7c4e2b9edeb3c3ca1 (patch) | |
| tree | 2731da99a956944ecc6ccf9500a416743aae06ba /ipc/msg.c | |
| parent | 40f576b5364c98919b0f913dec3f8c6d92e4ee0d (diff) | |
| parent | 49b5e1f71b720f4c3290f586d9231a7cffcb6935 (diff) | |
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc
Diffstat (limited to 'ipc/msg.c')
| -rw-r--r-- | ipc/msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index f4c494e3c93b..8a7d035dfefc 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -584,7 +584,7 @@ static int testmsg(struct msg_msg* msg,long type,int mode) return 0; } -static int inline pipelined_send(struct msg_queue* msq, struct msg_msg* msg) +static inline int pipelined_send(struct msg_queue* msq, struct msg_msg* msg) { struct list_head* tmp; @@ -693,7 +693,7 @@ out_free: return err; } -static int inline convert_mode(long* msgtyp, int msgflg) +static inline int convert_mode(long* msgtyp, int msgflg) { /* * find message of correct type. |