| From 3724d1b909c8015d6f29221662b9743e39c53ab0 Mon Sep 17 00:00:00 2001 |
| From: Ingo Molnar <mingo@elte.hu> |
| Date: Fri, 3 Jul 2009 08:29:39 -0500 |
| Subject: [PATCH] net: trivial tcp preempt fix for -rt |
| |
| commit e06f3b2d479a0f2ddbabda7f0333345f364b14b5 in tip. |
| |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c |
| index b0a26bb..02bebfe 100644 |
| --- a/net/ipv4/tcp.c |
| +++ b/net/ipv4/tcp.c |
| @@ -1405,11 +1405,11 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, |
| (len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) && |
| !sysctl_tcp_low_latency && |
| dma_find_channel(DMA_MEMCPY)) { |
| - preempt_enable_no_resched(); |
| + preempt_enable(); |
| tp->ucopy.pinned_list = |
| dma_pin_iovec_pages(msg->msg_iov, len); |
| } else { |
| - preempt_enable_no_resched(); |
| + preempt_enable(); |
| } |
| } |
| #endif |
| -- |
| 1.7.1.1 |
| |
