lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Use unlocked ioctl in nvram_64

Browse Source 
The ioctl is only used for powermac systems and reads a partition
number from an array which is initialized at boot time way before the
nvram code is initialized. So it's safe to switch to unlocked_ioctl.

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-14 22:42:28 +00:00
committed by Benjamin Herrenschmidt
parent 17e3767561
commit 3b03fecd12
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/kernel/nvram_64.c
View File

@@ -139,8 +139,8 @@ out:
} }
static int dev_nvram_ioctl(struct inode *inode, struct file *file, static long dev_nvram_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
switch(cmd) { switch(cmd) {
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
@@ -169,11 +169,11 @@ static int dev_nvram_ioctl(struct inode *inode, struct file *file,
} }
const struct file_operations nvram_fops = { const struct file_operations nvram_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = dev_nvram_llseek, .llseek = dev_nvram_llseek,
.read = dev_nvram_read, .read = dev_nvram_read,
.write = dev_nvram_write, .write = dev_nvram_write,
.ioctl = dev_nvram_ioctl, .unlocked_ioctl = dev_nvram_ioctl,
}; };
static struct miscdevice nvram_dev = { static struct miscdevice nvram_dev = {