---

yaml --- r: 14954 b: refs/heads/master c: 6736dc3 h: refs/heads/master v: v3
git-mirror · Dec 3, 2005 · 27ef7d2 · 27ef7d2
1 parent 65a9f66
commit 27ef7d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af2eb17bac41a116b73d85b3fb160405c32bea5b
+refs/heads/master: 6736dc35e9e1b9c8084d5c362a429a3e8189af6b
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
@@ -296,7 +296,6 @@ static void acpi_processor_idle(void)
 		smp_mb__after_clear_bit();
 		if (need_resched()) {
 			set_thread_flag(TIF_POLLING_NRFLAG);
-			local_irq_enable();
 			return;
 		}
 	}

diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
@@ -4743,11 +4743,6 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags,
 	struct sk_buff *skb;
 	long timeo;
 
-	/* Caller is allowed not to check sk->sk_err before calling.  */
-	error = sock_error(sk);
-	if (error)
-		goto no_packet;
-
 	timeo = sock_rcvtimeo(sk, noblock);
 
 	SCTP_DEBUG_PRINTK("Timeout: timeo: %ld, MAX: %ld.\n",
@@ -4774,6 +4769,11 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags,
 		if (skb)
 			return skb;
 
+		/* Caller is allowed not to check sk->sk_err before calling. */
+		error = sock_error(sk);
+		if (error)
+			goto no_packet;
+
 		if (sk->sk_shutdown & RCV_SHUTDOWN)
 			break;