From 26d3e0d9b1c3b760df8d97d3e039fee007c29633 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 15 May 2008 16:44:14 -0600
Subject: [PATCH] --- yaml --- r: 100299 b: refs/heads/master c:
 c43ef17450dce8cbf50f97497a1949ff8f484e88 h: refs/heads/master i:   100297:
 331b5bffced20a50cb062ef835529a4dd6fb8bed   100295:
 1250fcf367ee85ee777b391fe65ab9ea7ceaa251 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/snsc.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae29c3a1ff6c..05c0be011f58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78a3c3d7c6b89085610edfe86f7790144afc737e
+refs/heads/master: c43ef17450dce8cbf50f97497a1949ff8f484e88
diff --git a/trunk/drivers/char/snsc.c b/trunk/drivers/char/snsc.c
index 8fe099a41065..0b799ac1b049 100644
--- a/trunk/drivers/char/snsc.c
+++ b/trunk/drivers/char/snsc.c
@@ -21,6 +21,7 @@
 #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <asm/sn/io.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/module.h>
@@ -104,6 +105,7 @@ scdrv_open(struct inode *inode, struct file *file)
 	file->private_data = sd;
 
 	/* hook this subchannel up to the system controller interrupt */
+	lock_kernel();
 	rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,
 			 IRQF_SHARED | IRQF_DISABLED,
 			 SYSCTL_BASENAME, sd);
@@ -111,9 +113,10 @@ scdrv_open(struct inode *inode, struct file *file)
 		ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
 		kfree(sd);
 		printk("%s: irq request failed (%d)\n", __func__, rv);
+		unlock_kernel();
 		return -EBUSY;
 	}
-
+	unlock_kernel();
 	return 0;
 }