The patch titled
     ip27-rtc: convert ioctl to unlocked_ioctl
has been removed from the -mm tree.  Its filename was
     driver-ip27-rtc-convert-ioctl-to-unlocked_ioctl-v2.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: ip27-rtc: convert ioctl to unlocked_ioctl
From: Cyrill Gorcunov <[EMAIL PROTECTED]>

Convert ioctl call to unlocked_ioctl form.  It is possible (in that simple
way) due to a spinlock protection.

Signed-off-by: Cyrill Gorcunov <[EMAIL PROTECTED]>
Acked-by: Jiri Slaby <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/char/ip27-rtc.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff -puN 
drivers/char/ip27-rtc.c~driver-ip27-rtc-convert-ioctl-to-unlocked_ioctl-v2 
drivers/char/ip27-rtc.c
--- a/drivers/char/ip27-rtc.c~driver-ip27-rtc-convert-ioctl-to-unlocked_ioctl-v2
+++ a/drivers/char/ip27-rtc.c
@@ -46,8 +46,8 @@
 #include <asm/sn/sn0/hub.h>
 #include <asm/sn/sn_private.h>
 
-static int rtc_ioctl(struct inode *inode, struct file *file,
-                    unsigned int cmd, unsigned long arg);
+static long rtc_ioctl(struct file *filp, unsigned int cmd,
+                       unsigned long arg);
 
 static int rtc_read_proc(char *page, char **start, off_t off,
                          int count, int *eof, void *data);
@@ -75,8 +75,7 @@ static unsigned long epoch = 1970;    /* ye
 static const unsigned char days_in_mo[] =
 {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
-static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-                    unsigned long arg)
+static long rtc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
 
        struct rtc_time wtime;
@@ -197,7 +196,7 @@ static int rtc_release(struct inode *ino
 
 static const struct file_operations rtc_fops = {
        .owner          = THIS_MODULE,
-       .ioctl          = rtc_ioctl,
+       .unlocked_ioctl = rtc_ioctl,
        .open           = rtc_open,
        .release        = rtc_release,
 };
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
git-avr32.patch
git-dvb.patch
mount-options-fix-udf.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to