mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
powerpc: Use unlocked ioctl in nvram_64
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:
parent
17e3767561
commit
3b03fecd12
1 changed files with 7 additions and 7 deletions
|
@ -139,8 +139,8 @@ out:
|
|||
|
||||
}
|
||||
|
||||
static int dev_nvram_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
static long dev_nvram_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
switch(cmd) {
|
||||
#ifdef CONFIG_PPC_PMAC
|
||||
|
@ -173,7 +173,7 @@ const struct file_operations nvram_fops = {
|
|||
.llseek = dev_nvram_llseek,
|
||||
.read = dev_nvram_read,
|
||||
.write = dev_nvram_write,
|
||||
.ioctl = dev_nvram_ioctl,
|
||||
.unlocked_ioctl = dev_nvram_ioctl,
|
||||
};
|
||||
|
||||
static struct miscdevice nvram_dev = {
|
||||
|
|
Loading…
Reference in a new issue