Make the lock/unlock_kernel explicit.
Signed-off-by: Harvey Harrison <[email protected]>
---
arch/arm/common/rtctime.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c
index f53bca4..2062f92 100644
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
@@ -173,8 +173,7 @@ static unsigned int rtc_poll(struct file *file, poll_table *wait)
return data != 0 ? POLLIN | POLLRDNORM : 0;
}
-static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg)
+static int rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
struct rtc_ops *ops = file->private_data;
struct rtc_time tm;
@@ -182,6 +181,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
void __user *uarg = (void __user *)arg;
int ret = -EINVAL;
+ lock_kernel();
switch (cmd) {
case RTC_ALM_READ:
ret = rtc_arm_read_alarm(ops, &alrm);
@@ -276,6 +276,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
ret = ops->ioctl(cmd, arg);
break;
}
+ unlock_kernel();
return ret;
}
@@ -333,7 +334,7 @@ static const struct file_operations rtc_fops = {
.llseek = no_llseek,
.read = rtc_read,
.poll = rtc_poll,
- .ioctl = rtc_ioctl,
+ .unlocked_ioctl = rtc_ioctl,
.open = rtc_open,
.release = rtc_release,
.fasync = rtc_fasync,
--
1.5.4.3.500.g83a2c
Harvey Harrison napsal(a):
> Make the lock/unlock_kernel explicit.
>
> Signed-off-by: Harvey Harrison <[email protected]>
> ---
> arch/arm/common/rtctime.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c
> index f53bca4..2062f92 100644
> --- a/arch/arm/common/rtctime.c
> +++ b/arch/arm/common/rtctime.c
> @@ -173,8 +173,7 @@ static unsigned int rtc_poll(struct file *file, poll_table *wait)
> return data != 0 ? POLLIN | POLLRDNORM : 0;
> }
>
> -static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
> - unsigned long arg)
> +static int rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
long? I guess you need to get a cross-compiler...
On Tuesday 04 March 2008 23:58:01 Jiri Slaby wrote:
> Harvey Harrison napsal(a):
> > Make the lock/unlock_kernel explicit.
> >
> > Signed-off-by: Harvey Harrison <[email protected]>
> > ---
> > arch/arm/common/rtctime.c | 7 ++++---
> > 1 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c
> > index f53bca4..2062f92 100644
> > --- a/arch/arm/common/rtctime.c
> > +++ b/arch/arm/common/rtctime.c
> > @@ -173,8 +173,7 @@ static unsigned int rtc_poll(struct file *file, poll_table *wait)
> > return data != 0 ? POLLIN | POLLRDNORM : 0;
> > }
> >
> > -static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
> > - unsigned long arg)
> > +static int rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>
> long? I guess you need to get a cross-compiler...
Yes please do these transformations only for code that you can compile.
One easy way to do that is to do an allyesconfig build once and save the log (or
fetch http://halobates.de/allyes/i386-2.6.24-rc6-git12 and
http://halobates.de/allyes/x86_64-2.6.24-rc6-git12 as an older example)
and always check if the file you're changing is compiled in the log.
Then after changing do at least a make allyesconfig ; make path/to/file.o
-Andi
On Wed, Mar 05, 2008 at 11:16:45AM +0100, Andi Kleen wrote:
> One easy way to do that is to do an allyesconfig build once and
> save the log
Don't bother. As I keep saying and have been saying since the all*config
targets were introduced, they're useless for ARM, because ARM is soo
diverse.
You need to find a platform configuration which uses the file.
Eg,
$ grep rtctime arch/arm/common/Makefile
obj-y += rtctime.o
In this case, any one will do.
But lets say you modify arch/arm/common/uengine.c:
$ grep uengine arch/arm/common/Makefile
obj-$(CONFIG_ARCH_IXP2000) += uengine.o
obj-$(CONFIG_ARCH_IXP23XX) += uengine.o
$ grep CONFIG_ARCH_IXP2000= arch/arm/configs/*
arch/arm/configs/ixp2000_defconfig:CONFIG_ARCH_IXP2000=y
$ grep CONFIG_ARCH_IXP23XX= arch/arm/configs/*
arch/arm/configs/ixp23xx_defconfig:CONFIG_ARCH_IXP23XX=y
So now you know you need to use ixp2000_defconfig or ixp23xx_defconfig as
a basis for building uengine.c. (which is reasonable because it's an
IXP2000 or IXP2300 specific support file.)
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
On Thu, Mar 06, 2008 at 08:16:58AM +0000, Russell King wrote:
> On Wed, Mar 05, 2008 at 11:16:45AM +0100, Andi Kleen wrote:
> > One easy way to do that is to do an allyesconfig build once and
> > save the log
>
> Don't bother. As I keep saying and have been saying since the all*config
> targets were introduced, they're useless for ARM, because ARM is soo
> diverse.
It's more a white list for x86. Yes it would mean there will be no
such patches for ARM.
-Andi