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

Commit 4cddb886 authored by Alan Cox's avatar Alan Cox Committed by Tony Luck
Browse files

mmtimer: Push BKL down into the ioctl handler 



Switches to unlocked_ioctl read to remove ioctl BKL method. Fix the
unknown ioctl return. Probably a nice easy one to kill off BKL usage
entirely later

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Acked-by: default avatarJes Sorensen <jes@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent fb86611f

drivers/char/mmtimer.c

+15 −14
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/interrupt.h>

#include <linux/time.h>

#include <linux/math64.h>

#include <linux/smp_lock.h>



#include <asm/uaccess.h>

#include <asm/sn/addrs.h>
@@ -57,8 +58,8 @@ extern unsigned long sn_rtc_cycles_per_second; 


#define rtc_time()              (*RTC_COUNTER_ADDR)



static int mmtimer_ioctl(struct inode *inode, struct file *file,

			 unsigned int cmd, unsigned long arg);

static long mmtimer_ioctl(struct file *file, unsigned int cmd,

						unsigned long arg);

static int mmtimer_mmap(struct file *file, struct vm_area_struct *vma);



/*
@@ -69,7 +70,7 @@ static unsigned long mmtimer_femtoperiod = 0; 
static const struct file_operations mmtimer_fops = {

	.owner = THIS_MODULE,

	.mmap =	mmtimer_mmap,

	.ioctl =	mmtimer_ioctl,

	.unlocked_ioctl = mmtimer_ioctl,

};



/*
@@ -339,7 +340,6 @@ static void mmtimer_set_next_timer(int nodeid) 


/**

 * mmtimer_ioctl - ioctl interface for /dev/mmtimer

 * @inode: inode of the device

 * @file: file structure for the device

 * @cmd: command to execute

 * @arg: optional argument to command
@@ -365,11 +365,13 @@ static void mmtimer_set_next_timer(int nodeid) 
 * %MMTIMER_GETCOUNTER - Gets the current value in the counter and places it

 * in the address specified by @arg.

 */

static int mmtimer_ioctl(struct inode *inode, struct file *file,

			 unsigned int cmd, unsigned long arg)

static long mmtimer_ioctl(struct file *file, unsigned int cmd,

						unsigned long arg)

{

	int ret = 0;



	lock_kernel();



	switch (cmd) {

	case MMTIMER_GETOFFSET:	/* offset of the counter */

		/*
@@ -384,15 +386,14 @@ static int mmtimer_ioctl(struct inode *inode, struct file *file, 
	case MMTIMER_GETRES: /* resolution of the clock in 10^-15 s */

		if(copy_to_user((unsigned long __user *)arg,

				&mmtimer_femtoperiod, sizeof(unsigned long)))

			return -EFAULT;

			ret = -EFAULT;

		break;



	case MMTIMER_GETFREQ: /* frequency in Hz */

		if(copy_to_user((unsigned long __user *)arg,

				&sn_rtc_cycles_per_second,

				sizeof(unsigned long)))

			return -EFAULT;

		ret = 0;

			ret = -EFAULT;

		break;



	case MMTIMER_GETBITS: /* number of bits in the clock */
@@ -406,13 +407,13 @@ static int mmtimer_ioctl(struct inode *inode, struct file *file, 
	case MMTIMER_GETCOUNTER:

		if(copy_to_user((unsigned long __user *)arg,

				RTC_COUNTER_ADDR, sizeof(unsigned long)))

			return -EFAULT;

			ret = -EFAULT;

		break;

	default:

		ret = -ENOSYS;

		ret = -ENOTTY;

		break;

	}



	unlock_kernel();

	return ret;

}