3 files changed, 15 insertions, 8 deletions

diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 7050b4ffffcd..42c94c771afb 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -163,7 +163,7 @@ void do_gettimeofday(struct timeval *tv)
         unsigned long seq;
         unsigned long lost;
         unsigned long usec, sec;
-        unsigned long max_ntp_tick = tick_usec - tickadj;
+        unsigned long max_ntp_tick;
 
         do {
                 seq = read_seqbegin(&xtime_lock);
@@ -178,12 +178,13 @@ void do_gettimeofday(struct timeval *tv)
                  * Better to lose some accuracy than have time go backwards..
                  */
                 if (unlikely(time_adjust < 0)) {
+                        max_ntp_tick = (USEC_PER_SEC / HZ) - tickadj;
                         usec = min(usec, max_ntp_tick);
 
                         if (lost)
                                 usec += lost * max_ntp_tick;
                 } else if (unlikely(lost))
-                        usec += lost * tick_usec;
+                        usec += lost * (USEC_PER_SEC / HZ);
 
                 sec = xtime.tv_sec;
                 usec += (xtime.tv_nsec / 1000);
diff --git a/arch/mips/lib/iomap.c b/arch/mips/lib/iomap.c
index 7e2ced715cfb..f4ac5bbcd81f 100644
--- a/arch/mips/lib/iomap.c
+++ b/arch/mips/lib/iomap.c
@@ -63,7 +63,7 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
                 return ioport_map(start, len);
         if (flags & IORESOURCE_MEM) {
                 if (flags & IORESOURCE_CACHEABLE)
-                        return ioremap_cacheable_cow(start, len);
+                        return ioremap_cachable(start, len);
                 return ioremap_nocache(start, len);
         }
 
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 1b71d91e8268..0668e9bfce41 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -235,7 +235,9 @@ static inline void r4k_blast_scache_page_setup(void)
 {
         unsigned long sc_lsize = cpu_scache_line_size();
 
-        if (sc_lsize == 16)
+        if (scache_size == 0)
+                r4k_blast_scache_page = (void *)no_sc_noop;
+        else if (sc_lsize == 16)
                 r4k_blast_scache_page = blast_scache16_page;
         else if (sc_lsize == 32)
                 r4k_blast_scache_page = blast_scache32_page;
@@ -251,7 +253,9 @@ static inline void r4k_blast_scache_page_indexed_setup(void)
 {
         unsigned long sc_lsize = cpu_scache_line_size();
 
-        if (sc_lsize == 16)
+        if (scache_size == 0)
+                r4k_blast_scache_page_indexed = (void *)no_sc_noop;
+        else if (sc_lsize == 16)
                 r4k_blast_scache_page_indexed = blast_scache16_page_indexed;
         else if (sc_lsize == 32)
                 r4k_blast_scache_page_indexed = blast_scache32_page_indexed;
@@ -267,7 +271,9 @@ static inline void r4k_blast_scache_setup(void)
 {
         unsigned long sc_lsize = cpu_scache_line_size();
 
-        if (sc_lsize == 16)
+        if (scache_size == 0)
+                r4k_blast_scache = (void *)no_sc_noop;
+        else if (sc_lsize == 16)
                 r4k_blast_scache = blast_scache16;
         else if (sc_lsize == 32)
                 r4k_blast_scache = blast_scache32;
@@ -482,7 +488,7 @@ static inline void local_r4k_flush_icache_range(void *args)
                         protected_blast_dcache_range(start, end);
                 }
 
-                if (!cpu_icache_snoops_remote_store) {
+                if (!cpu_icache_snoops_remote_store && scache_size) {
                         if (end - start > scache_size)
                                 r4k_blast_scache();
                         else
@@ -651,7 +657,7 @@ static void local_r4k_flush_cache_sigtramp(void * arg)
 
         R4600_HIT_CACHEOP_WAR_IMPL;
         protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
-        if (!cpu_icache_snoops_remote_store)
+        if (!cpu_icache_snoops_remote_store && scache_size)
                 protected_writeback_scache_line(addr & ~(sc_lsize - 1));
         protected_flush_icache_line(addr & ~(ic_lsize - 1));
         if (MIPS4K_ICACHE_REFILL_WAR) {