path: root/include/asm-generic
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-21 16:39:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-21 16:39:08 -0800
commit0264405b84505f60ae00625f261e75a32c7ddf56 (patch)
tree202eda6bf55fcc8b6235dfe4218cea9442c0ea3c /include/asm-generic
parent7e65df3899cef3193ec44a7870f9bdc1ee6af833 (diff)
parentfb9de7ebc3a2eb7ddb83c92e288447a0c313bced (diff)
Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic cleanup from Arnd Bergmann: "These are a few cleanups for asm-generic: - a set of patches from Lars-Peter Clausen to generalize asm/mmu.h and use it in the architectures that don't need any special handling. - A patch from Will Deacon to remove the {read,write}s{b,w,l} as discussed during the arm64 review - A patch from James Hogan that helps with the meta architecture series." * tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: xtensa: Use generic asm/mmu.h for nommu h8300: Use generic asm/mmu.h c6x: Use generic asm/mmu.h asm-generic/mmu.h: Add support for FDPIC asm-generic/mmu.h: Remove unused vmlist field from mm_context_t asm-generic: io: remove {read,write} string functions asm-generic/io.h: remove asm/cacheflush.h include
Diffstat (limited to 'include/asm-generic')
2 files changed, 5 insertions, 32 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index d1e93284d72..33bbbae4ddc 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -12,7 +12,6 @@
#define __ASM_GENERIC_IO_H
#include <asm/page.h> /* I/O is all done through memory accesses */
-#include <asm/cacheflush.h>
#include <linux/types.h>
@@ -223,36 +222,6 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
-static inline void readsl(const void __iomem *addr, void *buf, int len)
- insl(addr - PCI_IOBASE, buf, len);
-static inline void readsw(const void __iomem *addr, void *buf, int len)
- insw(addr - PCI_IOBASE, buf, len);
-static inline void readsb(const void __iomem *addr, void *buf, int len)
- insb(addr - PCI_IOBASE, buf, len);
-static inline void writesl(const void __iomem *addr, const void *buf, int len)
- outsl(addr - PCI_IOBASE, buf, len);
-static inline void writesw(const void __iomem *addr, const void *buf, int len)
- outsw(addr - PCI_IOBASE, buf, len);
-static inline void writesb(const void __iomem *addr, const void *buf, int len)
- outsb(addr - PCI_IOBASE, buf, len);
#define ioread8(addr) readb(addr)
#define ioread16(addr) readw(addr)
diff --git a/include/asm-generic/mmu.h b/include/asm-generic/mmu.h
index 4f4aa56d6b5..0ed3f1cfb85 100644
--- a/include/asm-generic/mmu.h
+++ b/include/asm-generic/mmu.h
@@ -7,8 +7,12 @@
#ifndef __ASSEMBLY__
typedef struct {
- struct vm_list_struct *vmlist;
unsigned long end_brk;
+ unsigned long exec_fdpic_loadmap;
+ unsigned long interp_fdpic_loadmap;
} mm_context_t;