Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 11 deletions

diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c
index 34d15d548236..53c524e7b829 100644
--- a/drivers/char/efirtc.c
+++ b/drivers/char/efirtc.c
@@ -27,8 +27,6 @@
  *      - Add module support
  */
 
-
-#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
@@ -174,13 +172,12 @@ static long efi_rtc_ioctl(struct file *file, unsigned int cmd,
                         return -EINVAL;
 
                 case RTC_RD_TIME:
-                        lock_kernel();
                         spin_lock_irqsave(&efi_rtc_lock, flags);
 
                         status = efi.get_time(&eft, &cap);
 
                         spin_unlock_irqrestore(&efi_rtc_lock,flags);
-                        unlock_kernel();
+
                         if (status != EFI_SUCCESS) {
                                 /* should never happen */
                                 printk(KERN_ERR "efitime: can't read time\n");
@@ -202,13 +199,11 @@ static long efi_rtc_ioctl(struct file *file, unsigned int cmd,
 
                         convert_to_efi_time(&wtime, &eft);
 
-                        lock_kernel();
                         spin_lock_irqsave(&efi_rtc_lock, flags);
 
                         status = efi.set_time(&eft);
 
                         spin_unlock_irqrestore(&efi_rtc_lock,flags);
-                        unlock_kernel();
 
                         return status == EFI_SUCCESS ? 0 : -EINVAL;
 
@@ -224,7 +219,6 @@ static long efi_rtc_ioctl(struct file *file, unsigned int cmd,
 
                         convert_to_efi_time(&wtime, &eft);
 
-                        lock_kernel();
                         spin_lock_irqsave(&efi_rtc_lock, flags);
                         /*
                          * XXX Fixme:
@@ -235,19 +229,16 @@ static long efi_rtc_ioctl(struct file *file, unsigned int cmd,
                         status = efi.set_wakeup_time((efi_bool_t)enabled, &eft);
 
                         spin_unlock_irqrestore(&efi_rtc_lock,flags);
-                        unlock_kernel();
 
                         return status == EFI_SUCCESS ? 0 : -EINVAL;
 
                 case RTC_WKALM_RD:
 
-                        lock_kernel();
                         spin_lock_irqsave(&efi_rtc_lock, flags);
 
                         status = efi.get_wakeup_time((efi_bool_t *)&enabled, (efi_bool_t *)&pending, &eft);
 
                         spin_unlock_irqrestore(&efi_rtc_lock,flags);
-                        unlock_kernel();
 
                         if (status != EFI_SUCCESS) return -EINVAL;
 
@@ -277,7 +268,6 @@ static int efi_rtc_open(struct inode *inode, struct file *file)
          * We do accept multiple open files at the same time as we
          * synchronize on the per call operation.
          */
-        cycle_kernel_lock();
         return 0;
 }
 
@@ -295,6 +285,7 @@ static const struct file_operations efi_rtc_fops = {
         .unlocked_ioctl = efi_rtc_ioctl,
         .open           = efi_rtc_open,
         .release        = efi_rtc_close,
+        .llseek         = no_llseek,
 };
 
 static struct miscdevice efi_rtc_dev= {