git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
mach-fs
/
gpio.c
diff --git
a/arch/cris/arch-v32/drivers/mach-fs/gpio.c
b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
index
5ec8a7d
..
ee90d26
100644
(file)
--- a/
arch/cris/arch-v32/drivers/mach-fs/gpio.c
+++ b/
arch/cris/arch-v32/drivers/mach-fs/gpio.c
@@
-22,7
+22,7
@@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
-#include <linux/
smp_lock
.h>
+#include <linux/
mutex
.h>
#include <asm/etraxgpio.h>
#include <hwregs/reg_map.h>
#include <asm/etraxgpio.h>
#include <hwregs/reg_map.h>
@@
-64,6
+64,7
@@
static int dp_cnt;
#define DP(x)
#endif
#define DP(x)
#endif
+static DEFINE_MUTEX(gpio_mutex);
static char gpio_name[] = "etrax gpio";
#if 0
static char gpio_name[] = "etrax gpio";
#if 0
@@
-429,7
+430,7
@@
gpio_open(struct inode *inode, struct file *filp)
if (!priv)
return -ENOMEM;
if (!priv)
return -ENOMEM;
-
lock_kernel(
);
+
mutex_lock(&gpio_mutex
);
memset(priv, 0, sizeof(*priv));
priv->minor = p;
memset(priv, 0, sizeof(*priv));
priv->minor = p;
@@
-450,7
+451,7
@@
gpio_open(struct inode *inode, struct file *filp)
alarmlist = priv;
spin_unlock_irq(&alarm_lock);
alarmlist = priv;
spin_unlock_irq(&alarm_lock);
-
unlock_kernel(
);
+
mutex_unlock(&gpio_mutex
);
return 0;
}
return 0;
}
@@
-708,9
+709,9
@@
static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
long ret;
{
long ret;
-
lock_kernel(
);
+
mutex_lock(&gpio_mutex
);
ret = gpio_ioctl_unlocked(file, cmd, arg);
ret = gpio_ioctl_unlocked(file, cmd, arg);
-
unlock_kernel(
);
+
mutex_unlock(&gpio_mutex
);
return ret;
}
return ret;
}
@@
-870,6
+871,7
@@
static const struct file_operations gpio_fops = {
.write = gpio_write,
.open = gpio_open,
.release = gpio_release,
.write = gpio_write,
.open = gpio_open,
.release = gpio_release,
+ .llseek = noop_llseek,
};
#ifdef CONFIG_ETRAX_VIRTUAL_GPIO
};
#ifdef CONFIG_ETRAX_VIRTUAL_GPIO