hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macintosh: Remove BKL from nvram driver 

Drop the bkl from nvram_llseek() as it obviously protects nothing. The
file offset is safe in essence.

The ioctl can be converted to unlocked_ioctl because it just calls
pmac_get_partition() which reads a value from an array which was
initialized at early boot time. No need for serialization.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Thomas Gleixner 2009-10-15 10:28:38 +00:00 committed by Benjamin Herrenschmidt
parent 3b03fecd12
commit 0b048c7a1d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/macintosh/nvram.c
View File

@ -13,7 +13,6 @@
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/nvram.h> #include <linux/nvram.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/nvram.h> #include <asm/nvram.h>
@ -21,7 +20,6 @@
static loff_t nvram_llseek(struct file *file, loff_t offset, int origin) static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
{ {
lock_kernel();
switch (origin) { switch (origin) {
case 1: case 1:
offset += file->f_pos; offset += file->f_pos;
@ -30,12 +28,10 @@ static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
offset += NVRAM_SIZE; offset += NVRAM_SIZE;
break; break;
} }
if (offset < 0) { if (offset < 0)
unlock_kernel();
return -EINVAL; return -EINVAL;
}
file->f_pos = offset; file->f_pos = offset;
unlock_kernel();
return file->f_pos; return file->f_pos;
} }
@ -76,8 +72,7 @@ static ssize_t write_nvram(struct file *file, const char __user *buf,
return p - buf; return p - buf;
} }
static int nvram_ioctl(struct inode *inode, struct file *file, static long nvram_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
switch(cmd) { switch(cmd) {
case PMAC_NVRAM_GET_OFFSET: case PMAC_NVRAM_GET_OFFSET: