Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b03fecd authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Benjamin Herrenschmidt
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 17e37675

arch/powerpc/kernel/nvram_64.c

+7 −7
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ static ssize_t dev_nvram_write(struct file *file, const char __user *buf, 


}



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 = {