diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-20 06:57:46 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-20 06:57:46 +0200 |
commit | ea1b5574ff92c69ea0c18a4193ba9f2e985e1d55 (patch) | |
tree | ef8ee5b19fc71d87feb42655ffdbc0d3df9a44d4 | |
parent | b0cd3ce77e72c1cde0fd398fb92814c9fb772482 (diff) | |
parent | 6cb488b094ad0497ccf80e7739b31186dee0394e (diff) | |
download | lwn-ea1b5574ff92c69ea0c18a4193ba9f2e985e1d55.tar.gz lwn-ea1b5574ff92c69ea0c18a4193ba9f2e985e1d55.zip |
Merge branch 'rt/head' into rt/2.6.31
-rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 63a47f7c0c40..ab4df3626e55 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -830,7 +830,7 @@ static inline void pipelined_send(struct mqueue_inode_info *info, wake_up_process(receiver->task); smp_wmb(); receiver->state = STATE_READY; - preempt_enable_nort(); + preempt_enable_rt(); } /* pipelined_receive() - if there is task waiting in sys_mq_timedsend() |