Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc patches from Andrew Morton:
 "Incoming:

   - lots of misc stuff

   - backlight tree updates

   - lib/ updates

   - Oleg's percpu-rwsem changes

   - checkpatch

   - rtc

   - aoe

   - more checkpoint/restart support

  I still have a pile of MM stuff pending - Pekka should be merging
  later today after which that is good to go.  A number of other things
  are twiddling thumbs awaiting maintainer merges."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (180 commits)
  scatterlist: don't BUG when we can trivially return a proper error.
  docs: update documentation about /proc/<pid>/fdinfo/<fd> fanotify output
  fs, fanotify: add @mflags field to fanotify output
  docs: add documentation about /proc/<pid>/fdinfo/<fd> output
  fs, notify: add procfs fdinfo helper
  fs, exportfs: add exportfs_encode_inode_fh() helper
  fs, exportfs: escape nil dereference if no s_export_op present
  fs, epoll: add procfs fdinfo helper
  fs, eventfd: add procfs fdinfo helper
  procfs: add ability to plug in auxiliary fdinfo providers
  tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
  breakpoint selftests: print failure status instead of cause make error
  kcmp selftests: print fail status instead of cause make error
  kcmp selftests: make run_tests fix
  mem-hotplug selftests: print failure status instead of cause make error
  cpu-hotplug selftests: print failure status instead of cause make error
  mqueue selftests: print failure status instead of cause make error
  vm selftests: print failure status instead of cause make error
  ubifs: use prandom_bytes
  mtd: nandsim: use prandom_bytes
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 9e0ebe051243..d1e93284d72a 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -154,7 +154,7 @@ static inline void insb(unsigned long addr, void *buffer, int count)
         if (count) {
                 u8 *buf = buffer;
                 do {
-                        u8 x = inb(addr);
+                        u8 x = __raw_readb(addr + PCI_IOBASE);
                         *buf++ = x;
                 } while (--count);
         }
@@ -167,7 +167,7 @@ static inline void insw(unsigned long addr, void *buffer, int count)
         if (count) {
                 u16 *buf = buffer;
                 do {
-                        u16 x = inw(addr);
+                        u16 x = __raw_readw(addr + PCI_IOBASE);
                         *buf++ = x;
                 } while (--count);
         }
@@ -180,7 +180,7 @@ static inline void insl(unsigned long addr, void *buffer, int count)
         if (count) {
                 u32 *buf = buffer;
                 do {
-                        u32 x = inl(addr);
+                        u32 x = __raw_readl(addr + PCI_IOBASE);
                         *buf++ = x;
                 } while (--count);
         }
@@ -193,7 +193,7 @@ static inline void outsb(unsigned long addr, const void *buffer, int count)
         if (count) {
                 const u8 *buf = buffer;
                 do {
-                        outb(*buf++, addr);
+                        __raw_writeb(*buf++, addr + PCI_IOBASE);
                 } while (--count);
         }
 }
@@ -205,7 +205,7 @@ static inline void outsw(unsigned long addr, const void *buffer, int count)
         if (count) {
                 const u16 *buf = buffer;
                 do {
-                        outw(*buf++, addr);
+                        __raw_writew(*buf++, addr + PCI_IOBASE);
                 } while (--count);
         }
 }
@@ -217,7 +217,7 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
         if (count) {
                 const u32 *buf = buffer;
                 do {
-                        outl(*buf++, addr);
+                        __raw_writel(*buf++, addr + PCI_IOBASE);
                 } while (--count);
         }
 }