---

yaml --- r: 196033 b: refs/heads/master c: cdc6e3d h: refs/heads/master i: 196031: 00463a6 v: v3
git-mirror · May 21, 2010 · 525c76b · 525c76b
1 parent e28b664
commit 525c76b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4e6b09738fde057ce885703705f71cc953d0512
+refs/heads/master: cdc6e3d3968052cebb2f2ddcd742bff29fbd1a90
diff --git a/trunk/drivers/base/cpu.c b/trunk/drivers/base/cpu.c
@@ -186,7 +186,7 @@ static ssize_t print_cpus_offline(struct sysdev_class *class,
 	/* display offline cpus < nr_cpu_ids */
 	if (!alloc_cpumask_var(&offline, GFP_KERNEL))
 		return -ENOMEM;
-	cpumask_complement(offline, cpu_online_mask);
+	cpumask_andnot(offline, cpu_possible_mask, cpu_online_mask);
 	n = cpulist_scnprintf(buf, len, offline);
 	free_cpumask_var(offline);
 

diff --git a/trunk/drivers/scsi/iscsi_tcp.c b/trunk/drivers/scsi/iscsi_tcp.c
@@ -601,7 +601,7 @@ static void iscsi_sw_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
 	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
 	write_unlock_bh(&tcp_sw_conn->sock->sk->sk_callback_lock);
 
-	if (sk_sleep(sock->sk)) {
+	if (sk_sleep(sock->sk) && waitqueue_active(sk_sleep(sock->sk))) {
 		sock->sk->sk_err = EIO;
 		wake_up_interruptible(sk_sleep(sock->sk));
 	}

diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
@@ -78,7 +78,7 @@ enum {
 	IRQTF_AFFINITY,
 };
 
-/*
+/**
  * These values can be returned by request_any_context_irq() and
  * describe the context the interrupt will be run in.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ enum { @@
     	IRQTF_AFFINITY,
     };
-    /*
+    /**
      * These values can be returned by request_any_context_irq() and
      * describe the context the interrupt will be run in.
      *
@@ Expand Down @@