Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

Pull sparc updates from David Miller:

 1) Add sparc RAM output to /proc/iomem, from Bob Picco.

 2) Allow seeks on /dev/mdesc, from Khalid Aziz.

 3) Cleanup sparc64 I/O accessors, from Sam Ravnborg.

 4) If update_mmu_cache{,_pmd}() is called with an not-valid mapping, do
    not insert it into the TLB miss hash tables otherwise we'll
    livelock.  Based upon work by Christopher Alexander Tobias Schulze.

 5) Fix BREAK detection in sunsab driver when no actual characters are
    pending, from Christopher Alexander Tobias Schulze.

 6) Because we have modules --> openfirmware --> vmalloc ordering of
    virtual memory, the lazy VMAP TLB flusher can cons up an invocation
    of flush_tlb_kernel_range() that covers the openfirmware address
    range.  Unfortunately this will flush out the firmware's locked TLB
    mapping which causes all kinds of trouble.  Just split up the flush
    request if this happens, but in the long term the lazy VMAP flusher
    should probably be made a little bit smarter.

    Based upon work by Christopher Alexander Tobias Schulze.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
  sparc64: Fix up merge thinko.
  sparc: Add "install" target
  arch/sparc/math-emu/math_32.c: drop stray break operator
  sparc64: ldc_connect() should not return EINVAL when handshake is in progress.
  sparc64: Guard against flushing openfirmware mappings.
  sunsab: Fix detection of BREAK on sunsab serial console
  bbc-i2c: Fix BBC I2C envctrl on SunBlade 2000
  sparc64: Do not insert non-valid PTEs into the TSB hash table.
  sparc64: avoid code duplication in io_64.h
  sparc64: reorder functions in io_64.h
  sparc64: drop unused SLOW_DOWN_IO definitions
  sparc64: remove macro indirection in io_64.h
  sparc64: update IO access functions in PeeCeeI
  sparcspkr: use sbus_*() primitives for IO
  sparc: Add support for seek and shorter read to /dev/mdesc
  sparc: use %s for unaligned panic
  drivers/sbus/char: Micro-optimization in display7seg.c
  display7seg: Introduce the use of the managed version of kzalloc
  sparc64 - add mem to iomem resource

1 files changed, 18 insertions, 18 deletions

diff --git a/arch/sparc/lib/PeeCeeI.c b/arch/sparc/lib/PeeCeeI.c
index 6529f8657597..e6d183675990 100644
--- a/arch/sparc/lib/PeeCeeI.c
+++ b/arch/sparc/lib/PeeCeeI.c
@@ -15,7 +15,7 @@ void outsb(unsigned long __addr, const void *src, unsigned long count)
         const u8 *p = src;
 
         while (count--)
-                outb(*p++, addr);
+                __raw_writeb(*p++, addr);
 }
 EXPORT_SYMBOL(outsb);
 
@@ -93,21 +93,21 @@ void insb(unsigned long __addr, void *dst, unsigned long count)
                 u8 *pb = dst;
 
                 while ((((unsigned long)pb) & 0x3) && count--)
-                        *pb++ = inb(addr);
+                        *pb++ = __raw_readb(addr);
                 pi = (u32 *)pb;
                 while (count >= 4) {
                         u32 w;
 
-                        w  = (inb(addr) << 24);
-                        w |= (inb(addr) << 16);
-                        w |= (inb(addr) << 8);
-                        w |= (inb(addr) << 0);
+                        w  = (__raw_readb(addr) << 24);
+                        w |= (__raw_readb(addr) << 16);
+                        w |= (__raw_readb(addr) << 8);
+                        w |= (__raw_readb(addr) << 0);
                         *pi++ = w;
                         count -= 4;
                 }
                 pb = (u8 *)pi;
                 while (count--)
-                        *pb++ = inb(addr);
+                        *pb++ = __raw_readb(addr);
         }
 }
 EXPORT_SYMBOL(insb);
@@ -121,21 +121,21 @@ void insw(unsigned long __addr, void *dst, unsigned long count)
                 u32 *pi;
 
                 if (((unsigned long)ps) & 0x2) {
-                        *ps++ = le16_to_cpu(inw(addr));
+                        *ps++ = __raw_readw(addr);
                         count--;
                 }
                 pi = (u32 *)ps;
                 while (count >= 2) {
                         u32 w;
 
-                        w  = (le16_to_cpu(inw(addr)) << 16);
-                        w |= (le16_to_cpu(inw(addr)) << 0);
+                        w  = __raw_readw(addr) << 16;
+                        w |= __raw_readw(addr) << 0;
                         *pi++ = w;
                         count -= 2;
                 }
                 ps = (u16 *)pi;
                 if (count)
-                        *ps = le16_to_cpu(inw(addr));
+                        *ps = __raw_readw(addr);
         }
 }
 EXPORT_SYMBOL(insw);
@@ -148,7 +148,7 @@ void insl(unsigned long __addr, void *dst, unsigned long count)
                 if ((((unsigned long)dst) & 0x3) == 0) {
                         u32 *pi = dst;
                         while (count--)
-                                *pi++ = le32_to_cpu(inl(addr));
+                                *pi++ = __raw_readl(addr);
                 } else {
                         u32 l = 0, l2, *pi;
                         u16 *ps;
@@ -158,11 +158,11 @@ void insl(unsigned long __addr, void *dst, unsigned long count)
                         case 0x2:
                                 ps = dst;
                                 count -= 1;
-                                l = le32_to_cpu(inl(addr));
+                                l = __raw_readl(addr);
                                 *ps++ = l;
                                 pi = (u32 *)ps;
                                 while (count--) {
-                                        l2 = le32_to_cpu(inl(addr));
+                                        l2 = __raw_readl(addr);
                                         *pi++ = (l << 16) | (l2 >> 16);
                                         l = l2;
                                 }
@@ -173,13 +173,13 @@ void insl(unsigned long __addr, void *dst, unsigned long count)
                         case 0x1:
                                 pb = dst;
                                 count -= 1;
-                                l = le32_to_cpu(inl(addr));
+                                l = __raw_readl(addr);
                                 *pb++ = l >> 24;
                                 ps = (u16 *)pb;
                                 *ps++ = ((l >> 8) & 0xffff);
                                 pi = (u32 *)ps;
                                 while (count--) {
-                                        l2 = le32_to_cpu(inl(addr));
+                                        l2 = __raw_readl(addr);
                                         *pi++ = (l << 24) | (l2 >> 8);
                                         l = l2;
                                 }
@@ -190,11 +190,11 @@ void insl(unsigned long __addr, void *dst, unsigned long count)
                         case 0x3:
                                 pb = (u8 *)dst;
                                 count -= 1;
-                                l = le32_to_cpu(inl(addr));
+                                l = __raw_readl(addr);
                                 *pb++ = l >> 24;
                                 pi = (u32 *)pb;
                                 while (count--) {
-                                        l2 = le32_to_cpu(inl(addr));
+                                        l2 = __raw_readl(addr);
                                         *pi++ = (l << 8) | (l2 >> 24);
                                         l = l2;
                                 }