Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

20 files changed, 249 insertions, 182 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 0097a0d53b3b..e380a8322a94 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -958,7 +958,7 @@ config SOC_PNX8550
         bool
         select DMA_NONCOHERENT
         select HW_HAS_PCI
-        select SYS_HAS_CPU_R4X00
+        select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_32BIT_KERNEL
 
 config SWAP_IO_SPACE
diff --git a/arch/mips/boot/.gitignore b/arch/mips/boot/.gitignore
new file mode 100644
index 000000000000..ba63401c6e10
--- /dev/null
+++ b/arch/mips/boot/.gitignore
@@ -0,0 +1,4 @@
+mkboot
+elf2ecoff
+zImage
+zImage.tmp
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 95f84d711912..555837e4c06f 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -129,7 +129,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
-# CONFIG_CPU_MIPS32_R1 is not set
+CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
@@ -137,7 +137,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_R4300 is not set
-CONFIG_CPU_R4X00=y
+# CONFIG_CPU_R4X00 is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_R5000 is not set
 # CONFIG_CPU_R5432 is not set
@@ -148,10 +148,11 @@ CONFIG_CPU_R4X00=y
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_RM9000 is not set
 # CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_R4X00=y
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPSR1=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
 #
 # Kernel type
@@ -162,11 +163,11 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_CPU_HAS_PREFETCH=y
 # CONFIG_MIPS_MT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_LLDSCD=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index deb24c29ac0a..05e65206a7b4 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -128,7 +128,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
-# CONFIG_CPU_MIPS32_R1 is not set
+CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
@@ -136,7 +136,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_R4300 is not set
-CONFIG_CPU_R4X00=y
+# CONFIG_CPU_R4X00 is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_R5000 is not set
 # CONFIG_CPU_R5432 is not set
@@ -147,10 +147,11 @@ CONFIG_CPU_R4X00=y
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_RM9000 is not set
 # CONFIG_CPU_SB1 is not set
-CONFIG_SYS_HAS_CPU_R4X00=y
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPSR1=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
 #
 # Kernel type
@@ -161,6 +162,7 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_CPU_HAS_PREFETCH=y
 # CONFIG_MIPS_MT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
 CONFIG_CPU_ADVANCED=y
diff --git a/arch/mips/ddb5xxx/common/rtc_ds1386.c b/arch/mips/ddb5xxx/common/rtc_ds1386.c
index f5b11508ff2f..995896ac0e39 100644
--- a/arch/mips/ddb5xxx/common/rtc_ds1386.c
+++ b/arch/mips/ddb5xxx/common/rtc_ds1386.c
@@ -41,7 +41,9 @@ rtc_ds1386_get_time(void)
         u8 byte;
         u8 temp;
         unsigned int year, month, day, hour, minute, second;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* let us freeze external registers */
         byte = READ_RTC(0xB);
         byte &= 0x3f;
@@ -60,6 +62,7 @@ rtc_ds1386_get_time(void)
         /* enable time transfer */
         byte |= 0x80;
         WRITE_RTC(0xB, byte);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         /* calc hour */
         if (temp & 0x40) {
@@ -81,7 +84,9 @@ rtc_ds1386_set_time(unsigned long t)
         u8 byte;
         u8 temp;
         u8 year, month, day, hour, minute, second;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* let us freeze external registers */
         byte = READ_RTC(0xB);
         byte &= 0x3f;
@@ -133,6 +138,7 @@ rtc_ds1386_set_time(unsigned long t)
         if (second != READ_RTC(0x1)) {
                 WRITE_RTC(0x1, second);
         }
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index dc7091caa7aa..174822344131 100644
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -37,10 +37,25 @@
 #include <asm/dec/machtype.h>
 
 
+/*
+ * Returns true if a clock update is in progress
+ */
+static inline unsigned char dec_rtc_is_updating(void)
+{
+        unsigned char uip;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtc_lock, flags);
+        uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
+        spin_unlock_irqrestore(&rtc_lock, flags);
+        return uip;
+}
+
 static unsigned long dec_rtc_get_time(void)
 {
         unsigned int year, mon, day, hour, min, sec, real_year;
         int i;
+        unsigned long flags;
 
         /* The Linux interpretation of the DS1287 clock register contents:
          * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
@@ -49,11 +64,12 @@ static unsigned long dec_rtc_get_time(void)
          */
         /* read RTC exactly on falling edge of update flag */
         for (i = 0; i < 1000000; i++)   /* may take up to 1 second... */
-                if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)
+                if (dec_rtc_is_updating())
                         break;
         for (i = 0; i < 1000000; i++)   /* must try at least 2.228 ms */
-                if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP))
+                if (!dec_rtc_is_updating())
                         break;
+        spin_lock_irqsave(&rtc_lock, flags);
         /* Isn't this overkill?  UIP above should guarantee consistency */
         do {
                 sec = CMOS_READ(RTC_SECONDS);
@@ -77,6 +93,7 @@ static unsigned long dec_rtc_get_time(void)
          * of unused BBU RAM locations.
          */
         real_year = CMOS_READ(RTC_DEC_YEAR);
+        spin_unlock_irqrestore(&rtc_lock, flags);
         year += real_year - 72 + 2000;
 
         return mktime(year, mon, day, hour, min, sec);
@@ -95,6 +112,8 @@ static int dec_rtc_set_mmss(unsigned long nowtime)
         int real_seconds, real_minutes, cmos_minutes;
         unsigned char save_control, save_freq_select;
 
+        /* irq are locally disabled here */
+        spin_lock(&rtc_lock);
         /* tell the clock it's being set */
         save_control = CMOS_READ(RTC_CONTROL);
         CMOS_WRITE((save_control | RTC_SET), RTC_CONTROL);
@@ -141,6 +160,7 @@ static int dec_rtc_set_mmss(unsigned long nowtime)
          */
         CMOS_WRITE(save_control, RTC_CONTROL);
         CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
+        spin_unlock(&rtc_lock);
 
         return retval;
 }
diff --git a/arch/mips/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c
index 1ae4318e1358..8b407d7dc460 100644
--- a/arch/mips/jmr3927/common/rtc_ds1742.c
+++ b/arch/mips/jmr3927/common/rtc_ds1742.c
@@ -57,7 +57,9 @@ rtc_ds1742_get_time(void)
 {
         unsigned int year, month, day, hour, minute, second;
         unsigned int century;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         CMOS_WRITE(RTC_READ, RTC_CONTROL);
         second = BCD2BIN(CMOS_READ(RTC_SECONDS) & RTC_SECONDS_MASK);
         minute = BCD2BIN(CMOS_READ(RTC_MINUTES));
@@ -67,6 +69,7 @@ rtc_ds1742_get_time(void)
         year = BCD2BIN(CMOS_READ(RTC_YEAR));
         century = BCD2BIN(CMOS_READ(RTC_CENTURY) & RTC_CENTURY_MASK);
         CMOS_WRITE(0, RTC_CONTROL);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         year += century * 100;
 
@@ -81,7 +84,9 @@ rtc_ds1742_set_time(unsigned long t)
         u8 year, month, day, hour, minute, second;
         u8 cmos_year, cmos_month, cmos_day, cmos_hour, cmos_minute, cmos_second;
         int cmos_century;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         CMOS_WRITE(RTC_READ, RTC_CONTROL);
         cmos_second = (u8)(CMOS_READ(RTC_SECONDS) & RTC_SECONDS_MASK);
         cmos_minute = (u8)CMOS_READ(RTC_MINUTES);
@@ -139,6 +144,7 @@ rtc_ds1742_set_time(unsigned long t)
 
         /* RTC_CENTURY and RTC_CONTROL share same address... */
         CMOS_WRITE(cmos_century, RTC_CONTROL);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 908e63684208..dd118c60bcd0 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -502,8 +502,7 @@ asmlinkage int irix_sigpoll_sys(unsigned long __user *set,
         while(1) {
                 long tmp = 0;
 
-                current->state = TASK_INTERRUPTIBLE;
-                expire = schedule_timeout(expire);
+                expire = schedule_timeout_interruptible(expire);
 
                 for (i=0; i<=4; i++)
                         tmp |= (current->pending.signal.sig[i] & kset.sig[i]);
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 8c81f3cb4e2d..1d855112bac2 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -20,42 +20,42 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <asm/uaccess.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/vmalloc.h>
-#include <linux/elf.h>
-#include <linux/seq_file.h>
-#include <linux/syscalls.h>
-#include <linux/moduleloader.h>
-#include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <asm/mipsmtregs.h>
-#include <asm/cacheflush.h>
-#include <asm/atomic.h>
+#include <asm/bitops.h>
 #include <asm/cpu.h>
 #include <asm/processor.h>
-#include <asm/system.h>
 #include <asm/rtlx.h>
+#include <asm/uaccess.h>
 
-#define RTLX_MAJOR 64
 #define RTLX_TARG_VPE 1
 
-struct rtlx_info *rtlx;
+static struct rtlx_info *rtlx;
 static int major;
 static char module_name[] = "rtlx";
-static inline int spacefree(int read, int write, int size);
+static struct irqaction irq;
+static int irq_num;
+
+static inline int spacefree(int read, int write, int size)
+{
+        if (read == write) {
+                /*
+                 * never fill the buffer completely, so indexes are always
+                 * equal if empty and only empty, or !equal if data available
+                 */
+                return size - 1;
+        }
+
+        return ((read + size - write) % size) - 1;
+}
 
 static struct chan_waitqueues {
         wait_queue_head_t rt_queue;
         wait_queue_head_t lx_queue;
 } channel_wqs[RTLX_CHANNELS];
 
-static struct irqaction irq;
-static int irq_num;
-
 extern void *vpe_get_shared(int index);
 
 static void rtlx_dispatch(struct pt_regs *regs)
@@ -63,9 +63,8 @@ static void rtlx_dispatch(struct pt_regs *regs)
         do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ, regs);
 }
 
-irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        irqreturn_t r = IRQ_HANDLED;
         int i;
 
         for (i = 0; i < RTLX_CHANNELS; i++) {
@@ -75,30 +74,7 @@ irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                         wake_up_interruptible(&channel_wqs[i].lx_queue);
         }
 
-        return r;
-}
-
-void dump_rtlx(void)
-{
-        int i;
-
-        printk("id 0x%lx state %d\n", rtlx->id, rtlx->state);
-
-        for (i = 0; i < RTLX_CHANNELS; i++) {
-                struct rtlx_channel *chan = &rtlx->channel[i];
-
-                printk(" rt_state %d lx_state %d buffer_size %d\n",
-                       chan->rt_state, chan->lx_state, chan->buffer_size);
-
-                printk(" rt_read %d rt_write %d\n",
-                       chan->rt_read, chan->rt_write);
-
-                printk(" lx_read %d lx_write %d\n",
-                       chan->lx_read, chan->lx_write);
-
-                printk(" rt_buffer <%s>\n", chan->rt_buffer);
-                printk(" lx_buffer <%s>\n", chan->lx_buffer);
-        }
+        return IRQ_HANDLED;
 }
 
 /* call when we have the address of the shared structure from the SP side. */
@@ -108,7 +84,7 @@ static int rtlx_init(struct rtlx_info *rtlxi)
 
         if (rtlxi->id != RTLX_ID) {
                 printk(KERN_WARNING "no valid RTLX id at 0x%p\n", rtlxi);
-                return (-ENOEXEC);
+                return -ENOEXEC;
         }
 
         /* initialise the wait queues */
@@ -120,9 +96,8 @@ static int rtlx_init(struct rtlx_info *rtlxi)
         /* set up for interrupt handling */
         memset(&irq, 0, sizeof(struct irqaction));
 
-        if (cpu_has_vint) {
+        if (cpu_has_vint)
                 set_vi_handler(MIPS_CPU_RTLX_IRQ, rtlx_dispatch);
-        }
 
         irq_num = MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ;
         irq.handler = rtlx_interrupt;
@@ -132,7 +107,8 @@ static int rtlx_init(struct rtlx_info *rtlxi)
         setup_irq(irq_num, &irq);
 
         rtlx = rtlxi;
-        return (0);
+
+        return 0;
 }
 
 /* only allow one open process at a time to open each channel */
@@ -147,36 +123,36 @@ static int rtlx_open(struct inode *inode, struct file *filp)
         if (rtlx == NULL) {
                 struct rtlx_info **p;
                 if( (p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) {
-                        printk(" vpe_get_shared is NULL. Has an SP program been loaded?\n");
-                        return (-EFAULT);
+                        printk(KERN_ERR "vpe_get_shared is NULL. "
+                               "Has an SP program been loaded?\n");
+                        return -EFAULT;
                 }
 
                 if (*p == NULL) {
-                        printk(" vpe_shared %p %p\n", p, *p);
-                        return (-EFAULT);
+                        printk(KERN_ERR "vpe_shared %p %p\n", p, *p);
+                        return -EFAULT;
                 }
 
                 if ((ret = rtlx_init(*p)) < 0)
-                        return (ret);
+                        return ret;
         }
 
         chan = &rtlx->channel[minor];
 
-        /* already open? */
-        if (chan->lx_state == RTLX_STATE_OPENED)
-                return (-EBUSY);
+        if (test_and_set_bit(RTLX_STATE_OPENED, &chan->lx_state))
+                return -EBUSY;
 
-        chan->lx_state = RTLX_STATE_OPENED;
-        return (0);
+        return 0;
 }
 
 static int rtlx_release(struct inode *inode, struct file *filp)
 {
-        int minor;
+        int minor = MINOR(inode->i_rdev);
 
-        minor = MINOR(inode->i_rdev);
-        rtlx->channel[minor].lx_state = RTLX_STATE_UNUSED;
-        return (0);
+        clear_bit(RTLX_STATE_OPENED, &rtlx->channel[minor].lx_state);
+        smp_mb__after_clear_bit();
+
+        return 0;
 }
 
 static unsigned int rtlx_poll(struct file *file, poll_table * wait)
@@ -199,12 +175,13 @@ static unsigned int rtlx_poll(struct file *file, poll_table * wait)
         if (spacefree(chan->rt_read, chan->rt_write, chan->buffer_size))
                 mask |= POLLOUT | POLLWRNORM;
 
-        return (mask);
+        return mask;
 }
 
 static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
                          loff_t * ppos)
 {
+        unsigned long failed;
         size_t fl = 0L;
         int minor;
         struct rtlx_channel *lx;
@@ -216,7 +193,7 @@ static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
         /* data available? */
         if (lx->lx_write == lx->lx_read) {
                 if (file->f_flags & O_NONBLOCK)
-                        return (0);     // -EAGAIN makes cat whinge
+                        return 0;       /* -EAGAIN makes cat whinge */
 
                 /* go to sleep */
                 add_wait_queue(&channel_wqs[minor].lx_queue, &wait);
@@ -232,39 +209,39 @@ static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
         }
 
         /* find out how much in total */
-        count = min( count,
-                     (size_t)(lx->lx_write + lx->buffer_size - lx->lx_read) % lx->buffer_size);
+        count = min(count,
+                    (size_t)(lx->lx_write + lx->buffer_size - lx->lx_read) % lx->buffer_size);
 
         /* then how much from the read pointer onwards */
-        fl = min( count, (size_t)lx->buffer_size - lx->lx_read);
+        fl = min(count, (size_t)lx->buffer_size - lx->lx_read);
 
-        copy_to_user (buffer, &lx->lx_buffer[lx->lx_read], fl);
+        failed = copy_to_user (buffer, &lx->lx_buffer[lx->lx_read], fl);
+        if (failed) {
+                count = fl - failed;
+                goto out;
+        }
 
         /* and if there is anything left at the beginning of the buffer */
-        if ( count - fl )
-                copy_to_user (buffer + fl, lx->lx_buffer, count - fl);
+        if (count - fl) {
+                failed = copy_to_user (buffer + fl, lx->lx_buffer, count - fl);
+                if (failed) {
+                        count -= failed;
+                        goto out;
+                }
+        }
 
+out:
         /* update the index */
         lx->lx_read += count;
         lx->lx_read %= lx->buffer_size;
 
-        return (count);
-}
-
-static inline int spacefree(int read, int write, int size)
-{
-        if (read == write) {
-                /* never fill the buffer completely, so indexes are always equal if empty
-                   and only empty, or !equal if data available */
-                return (size - 1);
-        }
-
-        return ((read + size - write) % size) - 1;
+        return count;
 }
 
 static ssize_t rtlx_write(struct file *file, const char __user * buffer,
                           size_t count, loff_t * ppos)
 {
+        unsigned long failed;
         int minor;
         struct rtlx_channel *rt;
         size_t fl;
@@ -277,7 +254,7 @@ static ssize_t rtlx_write(struct file *file, const char __user * buffer,
         if (!spacefree(rt->rt_read, rt->rt_write, rt->buffer_size)) {
 
                 if (file->f_flags & O_NONBLOCK)
-                        return (-EAGAIN);
+                        return -EAGAIN;
 
                 add_wait_queue(&channel_wqs[minor].rt_queue, &wait);
                 set_current_state(TASK_INTERRUPTIBLE);
@@ -290,52 +267,64 @@ static ssize_t rtlx_write(struct file *file, const char __user * buffer,
         }
 
         /* total number of bytes to copy */
-        count = min( count, (size_t)spacefree(rt->rt_read, rt->rt_write, rt->buffer_size) );
+        count = min(count, (size_t)spacefree(rt->rt_read, rt->rt_write, rt->buffer_size) );
 
         /* first bit from write pointer to the end of the buffer, or count */
         fl = min(count, (size_t) rt->buffer_size - rt->rt_write);
 
-        copy_from_user(&rt->rt_buffer[rt->rt_write], buffer, fl);
+        failed = copy_from_user(&rt->rt_buffer[rt->rt_write], buffer, fl);
+        if (failed) {
+                count = fl - failed;
+                goto out;
+        }
 
         /* if there's any left copy to the beginning of the buffer */
-        if( count - fl )
-                copy_from_user(rt->rt_buffer, buffer + fl, count - fl);
+        if (count - fl) {
+                failed = copy_from_user(rt->rt_buffer, buffer + fl, count - fl);
+                if (failed) {
+                        count -= failed;
+                        goto out;
+                }
+        }
 
+out:
         rt->rt_write += count;
         rt->rt_write %= rt->buffer_size;
 
-        return(count);
+        return count;
 }
 
 static struct file_operations rtlx_fops = {
-        .owner = THIS_MODULE,
-        .open = rtlx_open,
-        .release = rtlx_release,
-        .write = rtlx_write,
-        .read = rtlx_read,
-        .poll = rtlx_poll
+        .owner          = THIS_MODULE,
+        .open           = rtlx_open,
+        .release        = rtlx_release,
+        .write          = rtlx_write,
+        .read           = rtlx_read,
+        .poll           = rtlx_poll
 };
 
-static int rtlx_module_init(void)
+static char register_chrdev_failed[] __initdata =
+        KERN_ERR "rtlx_module_init: unable to register device\n";
+
+static int __init rtlx_module_init(void)
 {
-        if ((major = register_chrdev(RTLX_MAJOR, module_name, &rtlx_fops)) < 0) {
-                printk("rtlx_module_init: unable to register device\n");
-                return (-EBUSY);
+        major = register_chrdev(0, module_name, &rtlx_fops);
+        if (major < 0) {
+                printk(register_chrdev_failed);
+                return major;
         }
 
-        if (major == 0)
-                major = RTLX_MAJOR;
-
-        return (0);
+        return 0;
 }
 
-static void rtlx_module_exit(void)
+static void __exit rtlx_module_exit(void)
 {
         unregister_chrdev(major, module_name);
 }
 
 module_init(rtlx_module_init);
 module_exit(rtlx_module_exit);
+
 MODULE_DESCRIPTION("MIPS RTLX");
-MODULE_AUTHOR("Elizabeth Clarke, MIPS Technologies, Inc");
+MODULE_AUTHOR("Elizabeth Clarke, MIPS Technologies, Inc.");
 MODULE_LICENSE("GPL");
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 9202a17db8f7..05e09eedabff 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -384,9 +384,6 @@ give_sigsegv:
         return 0;
 }
 
-extern void setup_rt_frame_n32(struct k_sigaction * ka,
-        struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info);
-
 static inline int handle_signal(unsigned long sig, siginfo_t *info,
         struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
 {
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index dbe821303125..e315d3f6aa6e 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -647,8 +647,8 @@ static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
         return (void *)((sp - frame_size) & ALMASK);
 }
 
-void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
-                               int signr, sigset_t *set)
+int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
+        int signr, sigset_t *set)
 {
         struct sigframe *frame;
         int err = 0;
@@ -694,13 +694,15 @@ void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
                current->comm, current->pid,
                frame, regs->cp0_epc, frame->sf_code);
 #endif
-        return;
+        return 1;
 
 give_sigsegv:
         force_sigsegv(signr, current);
+        return 0;
 }
 
-void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr,        sigset_t *set, siginfo_t *info)
+int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
+        int signr, sigset_t *set, siginfo_t *info)
 {
         struct rt_sigframe32 *frame;
         int err = 0;
@@ -763,10 +765,11 @@ void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr,
                current->comm, current->pid,
                frame, regs->cp0_epc, frame->rs_code);
 #endif
-        return;
+        return 1;
 
 give_sigsegv:
         force_sigsegv(signr, current);
+        return 0;
 }
 
 static inline int handle_signal(unsigned long sig, siginfo_t *info,
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 97fefcc9dbe7..06be405be399 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -58,10 +58,6 @@
 
 typedef void *vpe_handle;
 
-// defined here because the kernel module loader doesn't have
-// anything to do with it.
-#define SHN_MIPS_SCOMMON 0xff03
-
 #ifndef ARCH_SHF_SMALL
 #define ARCH_SHF_SMALL 0
 #endif
@@ -69,11 +65,8 @@ typedef void *vpe_handle;
 /* If this is set, the section belongs in the init part of the module */
 #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
 
-// temp number,
-#define VPE_MAJOR 63
-
 static char module_name[] = "vpe";
-static int major = 0;
+static int major;
 
 /* grab the likely amount of memory we will need. */
 #ifdef CONFIG_MIPS_VPE_LOADER_TOM
@@ -98,22 +91,7 @@ enum tc_state {
         TC_STATE_DYNAMIC
 };
 
-struct vpe;
-typedef struct tc {
-        enum tc_state state;
-        int index;
-
-        /* parent VPE */
-        struct vpe *pvpe;
-
-        /* The list of TC's with this VPE */
-        struct list_head tc;
-
-        /* The global list of tc's */
-        struct list_head list;
-} tc_t;
-
-typedef struct vpe {
+struct vpe {
         enum vpe_state state;
 
         /* (device) minor associated with this vpe */
@@ -135,7 +113,21 @@ typedef struct vpe {
 
         /* shared symbol address */
         void *shared_ptr;
-} vpe_t;
+};
+
+struct tc {
+        enum tc_state state;
+        int index;
+
+        /* parent VPE */
+        struct vpe *pvpe;
+
+        /* The list of TC's with this VPE */
+        struct list_head tc;
+
+        /* The global list of tc's */
+        struct list_head list;
+};
 
 struct vpecontrol_ {
         /* Virtual processing elements */
@@ -146,7 +138,7 @@ struct vpecontrol_ {
 } vpecontrol;
 
 static void release_progmem(void *ptr);
-static void dump_vpe(vpe_t * v);
+static void dump_vpe(struct vpe * v);
 extern void save_gp_address(unsigned int secbase, unsigned int rel);
 
 /* get the vpe associated with this minor */
@@ -197,13 +189,11 @@ struct vpe *alloc_vpe(int minor)
 {
         struct vpe *v;
 
-        if ((v = kmalloc(sizeof(struct vpe), GFP_KERNEL)) == NULL) {
+        if ((v = kzalloc(sizeof(struct vpe), GFP_KERNEL)) == NULL) {
                 printk(KERN_WARNING "VPE: alloc_vpe no mem\n");
                 return NULL;
         }
 
-        memset(v, 0, sizeof(struct vpe));
-
         INIT_LIST_HEAD(&v->tc);
         list_add_tail(&v->list, &vpecontrol.vpe_list);
 
@@ -216,13 +206,11 @@ struct tc *alloc_tc(int index)
 {
         struct tc *t;
 
-        if ((t = kmalloc(sizeof(struct tc), GFP_KERNEL)) == NULL) {
+        if ((t = kzalloc(sizeof(struct tc), GFP_KERNEL)) == NULL) {
                 printk(KERN_WARNING "VPE: alloc_tc no mem\n");
                 return NULL;
         }
 
-        memset(t, 0, sizeof(struct tc));
-
         INIT_LIST_HEAD(&t->tc);
         list_add_tail(&t->list, &vpecontrol.tc_list);
 
@@ -412,16 +400,17 @@ static int apply_r_mips_26(struct module *me, uint32_t *location,
                 return -ENOEXEC;
         }
 
-/* Not desperately convinced this is a good check of an overflow condition
-   anyway. But it gets in the way of handling undefined weak symbols which
-   we want to set to zero.
-   if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
-   printk(KERN_ERR
-   "module %s: relocation overflow\n",
-   me->name);
-   return -ENOEXEC;
-   }
-*/
+/*
+ * Not desperately convinced this is a good check of an overflow condition
+ * anyway. But it gets in the way of handling undefined weak symbols which
+ * we want to set to zero.
+ * if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+ * printk(KERN_ERR
+ * "module %s: relocation overflow\n",
+ * me->name);
+ * return -ENOEXEC;
+ * }
+ */
 
         *location = (*location & ~0x03ffffff) |
                 ((*location + (v >> 2)) & 0x03ffffff);
@@ -681,7 +670,7 @@ static void dump_tclist(void)
 }
 
 /* We are prepared so configure and start the VPE... */
-int vpe_run(vpe_t * v)
+int vpe_run(struct vpe * v)
 {
         unsigned long val;
         struct tc *t;
@@ -772,7 +761,7 @@ int vpe_run(vpe_t * v)
         return 0;
 }
 
-static unsigned long find_vpe_symbols(vpe_t * v, Elf_Shdr * sechdrs,
+static unsigned long find_vpe_symbols(struct vpe * v, Elf_Shdr * sechdrs,
                                       unsigned int symindex, const char *strtab,
                                       struct module *mod)
 {
@@ -792,10 +781,12 @@ static unsigned long find_vpe_symbols(vpe_t * v, Elf_Shdr * sechdrs,
         return 0;
 }
 
-/* Allocates a VPE with some program code space(the load address), copies the contents
-   of the program (p)buffer performing relocatations/etc, free's it when finished.
+/*
+ * Allocates a VPE with some program code space(the load address), copies
+ * the contents of the program (p)buffer performing relocatations/etc,
+ * free's it when finished.
 */
-int vpe_elfload(vpe_t * v)
+int vpe_elfload(struct vpe * v)
 {
         Elf_Ehdr *hdr;
         Elf_Shdr *sechdrs;
@@ -931,7 +922,7 @@ cleanup:
         return err;
 }
 
-static void dump_vpe(vpe_t * v)
+static void dump_vpe(struct vpe * v)
 {
         struct tc *t;
 
@@ -947,7 +938,7 @@ static void dump_vpe(vpe_t * v)
 static int vpe_open(struct inode *inode, struct file *filp)
 {
         int minor;
-        vpe_t *v;
+        struct vpe *v;
 
         /* assume only 1 device at the mo. */
         if ((minor = MINOR(inode->i_rdev)) != 1) {
@@ -1001,7 +992,7 @@ static int vpe_open(struct inode *inode, struct file *filp)
 static int vpe_release(struct inode *inode, struct file *filp)
 {
         int minor, ret = 0;
-        vpe_t *v;
+        struct vpe *v;
         Elf_Ehdr *hdr;
 
         minor = MINOR(inode->i_rdev);
@@ -1035,7 +1026,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
 {
         int minor;
         size_t ret = count;
-        vpe_t *v;
+        struct vpe *v;
 
         minor = MINOR(file->f_dentry->d_inode->i_rdev);
         if ((v = get_vpe(minor)) == NULL)
@@ -1180,14 +1171,11 @@ static int __init vpe_module_init(void)
                 return -ENODEV;
         }
 
-        if ((major = register_chrdev(VPE_MAJOR, module_name, &vpe_fops) < 0)) {
+        if ((major = register_chrdev(0, module_name, &vpe_fops) < 0)) {
                 printk("VPE loader: unable to register character device\n");
-                return -EBUSY;
+                return major;
         }
 
-        if (major == 0)
-                major = VPE_MAJOR;
-
         dmt();
         dvpe();
 
diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c
index 9d7812e03dcd..7dced67c55eb 100644
--- a/arch/mips/lasat/ds1603.c
+++ b/arch/mips/lasat/ds1603.c
@@ -8,6 +8,7 @@
 #include <asm/lasat/lasat.h>
 #include <linux/delay.h>
 #include <asm/lasat/ds1603.h>
+#include <asm/time.h>
 
 #include "ds1603.h"
 
@@ -138,19 +139,27 @@ static void rtc_end_op(void)
 unsigned long ds1603_read(void)
 {
         unsigned long word;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtc_lock, flags);
         rtc_init_op();
         rtc_write_byte(READ_TIME_CMD);
         word = rtc_read_word();
         rtc_end_op();
+        spin_unlock_irqrestore(&rtc_lock, flags);
         return word;
 }
 
 int ds1603_set(unsigned long time)
 {
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtc_lock, flags);
         rtc_init_op();
         rtc_write_byte(SET_TIME_CMD);
         rtc_write_word(time);
         rtc_end_op();
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c
index 768bf4406452..bab192ddc185 100644
--- a/arch/mips/momentum/jaguar_atx/setup.c
+++ b/arch/mips/momentum/jaguar_atx/setup.c
@@ -149,7 +149,9 @@ arch_initcall(per_cpu_mappings);
 unsigned long m48t37y_get_time(void)
 {
         unsigned int year, month, day, hour, min, sec;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* stop the update */
         rtc_base[0x7ff8] = 0x40;
 
@@ -166,6 +168,7 @@ unsigned long m48t37y_get_time(void)
 
         /* start the update */
         rtc_base[0x7ff8] = 0x00;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return mktime(year, month, day, hour, min, sec);
 }
@@ -173,11 +176,13 @@ unsigned long m48t37y_get_time(void)
 int m48t37y_set_time(unsigned long sec)
 {
         struct rtc_time tm;
+        unsigned long flags;
 
         /* convert to a more useful format -- note months count from 0 */
         to_tm(sec, &tm);
         tm.tm_mon += 1;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* enable writing */
         rtc_base[0x7ff8] = 0x80;
 
@@ -201,6 +206,7 @@ int m48t37y_set_time(unsigned long sec)
 
         /* disable writing */
         rtc_base[0x7ff8] = 0x00;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/momentum/ocelot_3/setup.c b/arch/mips/momentum/ocelot_3/setup.c
index a7803e08f9db..c9b7ff8148ec 100644
--- a/arch/mips/momentum/ocelot_3/setup.c
+++ b/arch/mips/momentum/ocelot_3/setup.c
@@ -135,7 +135,9 @@ void setup_wired_tlb_entries(void)
 unsigned long m48t37y_get_time(void)
 {
         unsigned int year, month, day, hour, min, sec;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* stop the update */
         rtc_base[0x7ff8] = 0x40;
 
@@ -152,6 +154,7 @@ unsigned long m48t37y_get_time(void)
 
         /* start the update */
         rtc_base[0x7ff8] = 0x00;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return mktime(year, month, day, hour, min, sec);
 }
@@ -159,11 +162,13 @@ unsigned long m48t37y_get_time(void)
 int m48t37y_set_time(unsigned long sec)
 {
         struct rtc_time tm;
+        unsigned long flags;
 
         /* convert to a more useful format -- note months count from 0 */
         to_tm(sec, &tm);
         tm.tm_mon += 1;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* enable writing */
         rtc_base[0x7ff8] = 0x80;
 
@@ -187,6 +192,7 @@ int m48t37y_set_time(unsigned long sec)
 
         /* disable writing */
         rtc_base[0x7ff8] = 0x00;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c
index ce70fc96f160..2755c1547473 100644
--- a/arch/mips/momentum/ocelot_c/setup.c
+++ b/arch/mips/momentum/ocelot_c/setup.c
@@ -140,7 +140,9 @@ unsigned long m48t37y_get_time(void)
         unsigned char* rtc_base = (unsigned char*)0xfc800000;
 #endif
         unsigned int year, month, day, hour, min, sec;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* stop the update */
         rtc_base[0x7ff8] = 0x40;
 
@@ -157,6 +159,7 @@ unsigned long m48t37y_get_time(void)
 
         /* start the update */
         rtc_base[0x7ff8] = 0x00;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return mktime(year, month, day, hour, min, sec);
 }
@@ -169,11 +172,13 @@ int m48t37y_set_time(unsigned long sec)
         unsigned char* rtc_base = (unsigned char*)0xfc800000;
 #endif
         struct rtc_time tm;
+        unsigned long flags;
 
         /* convert to a more useful format -- note months count from 0 */
         to_tm(sec, &tm);
         tm.tm_mon += 1;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* enable writing */
         rtc_base[0x7ff8] = 0x80;
 
@@ -197,6 +202,7 @@ int m48t37y_set_time(unsigned long sec)
 
         /* disable writing */
         rtc_base[0x7ff8] = 0x00;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c
index bdc2ab55bed6..059755b5ed57 100644
--- a/arch/mips/pmc-sierra/yosemite/setup.c
+++ b/arch/mips/pmc-sierra/yosemite/setup.c
@@ -73,7 +73,9 @@ void __init bus_error_init(void)
 unsigned long m48t37y_get_time(void)
 {
         unsigned int year, month, day, hour, min, sec;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* Stop the update to the time */
         m48t37_base->control = 0x40;
 
@@ -88,6 +90,7 @@ unsigned long m48t37y_get_time(void)
 
         /* Start the update to the time again */
         m48t37_base->control = 0x00;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return mktime(year, month, day, hour, min, sec);
 }
@@ -95,11 +98,13 @@ unsigned long m48t37y_get_time(void)
 int m48t37y_set_time(unsigned long sec)
 {
         struct rtc_time tm;
+        unsigned long flags;
 
         /* convert to a more useful format -- note months count from 0 */
         to_tm(sec, &tm);
         tm.tm_mon += 1;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* enable writing */
         m48t37_base->control = 0x80;
 
@@ -123,6 +128,7 @@ int m48t37y_set_time(unsigned long sec)
 
         /* disable writing */
         m48t37_base->control = 0x00;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index df9b5694328a..b7300cc5c5ad 100644
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -35,7 +35,9 @@ static unsigned long indy_rtc_get_time(void)
 {
         unsigned int yrs, mon, day, hrs, min, sec;
         unsigned int save_control;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff;
         hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE;
 
@@ -47,6 +49,7 @@ static unsigned long indy_rtc_get_time(void)
         yrs = BCD2BIN(hpc3c0->rtcregs[RTC_YEAR] & 0xff);
 
         hpc3c0->rtcregs[RTC_CMD] = save_control;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         if (yrs < 45)
                 yrs += 30;
@@ -60,6 +63,7 @@ static int indy_rtc_set_time(unsigned long tim)
 {
         struct rtc_time tm;
         unsigned int save_control;
+        unsigned long flags;
 
         to_tm(tim, &tm);
 
@@ -68,6 +72,7 @@ static int indy_rtc_set_time(unsigned long tim)
         if (tm.tm_year >= 100)
                 tm.tm_year -= 100;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff;
         hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE;
 
@@ -80,6 +85,7 @@ static int indy_rtc_set_time(unsigned long tim)
         hpc3c0->rtcregs[RTC_HUNDREDTH_SECOND] = 0;
 
         hpc3c0->rtcregs[RTC_CMD] = save_control;
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/sibyte/swarm/rtc_m41t81.c b/arch/mips/sibyte/swarm/rtc_m41t81.c
index 5b4fc26c1b36..c13914bdda59 100644
--- a/arch/mips/sibyte/swarm/rtc_m41t81.c
+++ b/arch/mips/sibyte/swarm/rtc_m41t81.c
@@ -144,6 +144,7 @@ static int m41t81_write(uint8_t addr, int b)
 int m41t81_set_time(unsigned long t)
 {
         struct rtc_time tm;
+        unsigned long flags;
 
         to_tm(t, &tm);
 
@@ -153,6 +154,7 @@ int m41t81_set_time(unsigned long t)
          * believe we should finish writing min within a second.
          */
 
+        spin_lock_irqsave(&rtc_lock, flags);
         tm.tm_sec = BIN2BCD(tm.tm_sec);
         m41t81_write(M41T81REG_SC, tm.tm_sec);
 
@@ -180,6 +182,7 @@ int m41t81_set_time(unsigned long t)
         tm.tm_year %= 100;
         tm.tm_year = BIN2BCD(tm.tm_year);
         m41t81_write(M41T81REG_YR, tm.tm_year);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
@@ -187,19 +190,23 @@ int m41t81_set_time(unsigned long t)
 unsigned long m41t81_get_time(void)
 {
         unsigned int year, mon, day, hour, min, sec;
+        unsigned long flags;
 
         /*
          * min is valid if two reads of sec are the same.
          */
         for (;;) {
+                spin_lock_irqsave(&rtc_lock, flags);
                 sec = m41t81_read(M41T81REG_SC);
                 min = m41t81_read(M41T81REG_MN);
                 if (sec == m41t81_read(M41T81REG_SC)) break;
+                spin_unlock_irqrestore(&rtc_lock, flags);
         }
         hour = m41t81_read(M41T81REG_HR) & 0x3f;
         day = m41t81_read(M41T81REG_DT);
         mon = m41t81_read(M41T81REG_MO);
         year = m41t81_read(M41T81REG_YR);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         sec = BCD2BIN(sec);
         min = BCD2BIN(min);
diff --git a/arch/mips/sibyte/swarm/rtc_xicor1241.c b/arch/mips/sibyte/swarm/rtc_xicor1241.c
index d9ff9323f24e..f4a178836415 100644
--- a/arch/mips/sibyte/swarm/rtc_xicor1241.c
+++ b/arch/mips/sibyte/swarm/rtc_xicor1241.c
@@ -113,9 +113,11 @@ int xicor_set_time(unsigned long t)
 {
         struct rtc_time tm;
         int tmp;
+        unsigned long flags;
 
         to_tm(t, &tm);
 
+        spin_lock_irqsave(&rtc_lock, flags);
         /* unlock writes to the CCR */
         xicor_write(X1241REG_SR, X1241REG_SR_WEL);
         xicor_write(X1241REG_SR, X1241REG_SR_WEL | X1241REG_SR_RWEL);
@@ -160,6 +162,7 @@ int xicor_set_time(unsigned long t)
         xicor_write(X1241REG_HR, tmp);
 
         xicor_write(X1241REG_SR, 0);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return 0;
 }
@@ -167,7 +170,9 @@ int xicor_set_time(unsigned long t)
 unsigned long xicor_get_time(void)
 {
         unsigned int year, mon, day, hour, min, sec, y2k;
+        unsigned long flags;
 
+        spin_lock_irqsave(&rtc_lock, flags);
         sec = xicor_read(X1241REG_SC);
         min = xicor_read(X1241REG_MN);
         hour = xicor_read(X1241REG_HR);
@@ -183,6 +188,7 @@ unsigned long xicor_get_time(void)
         mon = xicor_read(X1241REG_MO);
         year = xicor_read(X1241REG_YR);
         y2k = xicor_read(X1241REG_Y2K);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         sec = BCD2BIN(sec);
         min = BCD2BIN(min);