tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 0264405b 7e65df38

+9 -68
+1
arch/c6x/include/asm/Kbuild
··· 25 25 generic-y += kmap_types.h 26 26 generic-y += local.h 27 27 generic-y += mman.h 28 + generic-y += mmu.h 28 29 generic-y += mmu_context.h 29 30 generic-y += msgbuf.h 30 31 generic-y += param.h
-22
arch/c6x/include/asm/mmu.h
··· 1 - /* 2 - * Port on Texas Instruments TMS320C6x architecture 3 - * 4 - * Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated 5 - * Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com) 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License version 2 as 9 - * published by the Free Software Foundation. 10 - */ 11 - #ifndef _ASM_C6X_MMU_H 12 - #define _ASM_C6X_MMU_H 13 - 14 - typedef struct { 15 - unsigned long end_brk; 16 - #ifdef CONFIG_BINFMT_ELF_FDPIC 17 - unsigned long exec_fdpic_loadmap; 18 - unsigned long interp_fdpic_loadmap; 19 - #endif 20 - } mm_context_t; 21 - 22 - #endif /* _ASM_C6X_MMU_H */
+1
arch/h8300/include/asm/Kbuild
··· 1 1 2 2 generic-y += clkdev.h 3 3 generic-y += exec.h 4 + generic-y += mmu.h 4 5 generic-y += module.h 5 6 generic-y += trace_clock.h
-10
arch/h8300/include/asm/mmu.h
··· 1 - #ifndef __MMU_H 2 - #define __MMU_H 3 - 4 - /* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */ 5 - 6 - typedef struct { 7 - unsigned long end_brk; 8 - } mm_context_t; 9 - 10 - #endif
+1
arch/openrisc/include/asm/io.h
··· 30 30 #define PIO_MASK 0 31 31 32 32 #include <asm-generic/io.h> 33 + #include <asm/pgtable.h> 33 34 34 35 extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size, 35 36 pgprot_t prot);
+1 -1
arch/xtensa/include/asm/mmu.h
··· 12 12 #define _XTENSA_MMU_H 13 13 14 14 #ifndef CONFIG_MMU 15 - #include <asm/nommu.h> 15 + #include <asm-generic/mmu.h> 16 16 #else 17 17 18 18 /* Default "unsigned long" context */
-3
arch/xtensa/include/asm/nommu.h
··· 1 - typedef struct { 2 - unsigned long end_brk; 3 - } mm_context_t;
-31
include/asm-generic/io.h
··· 12 12 #define __ASM_GENERIC_IO_H 13 13 14 14 #include <asm/page.h> /* I/O is all done through memory accesses */ 15 - #include <asm/cacheflush.h> 16 15 #include <linux/types.h> 17 16 18 17 #ifdef CONFIG_GENERIC_IOMAP ··· 221 222 } 222 223 } 223 224 #endif 224 - 225 - static inline void readsl(const void __iomem *addr, void *buf, int len) 226 - { 227 - insl(addr - PCI_IOBASE, buf, len); 228 - } 229 - 230 - static inline void readsw(const void __iomem *addr, void *buf, int len) 231 - { 232 - insw(addr - PCI_IOBASE, buf, len); 233 - } 234 - 235 - static inline void readsb(const void __iomem *addr, void *buf, int len) 236 - { 237 - insb(addr - PCI_IOBASE, buf, len); 238 - } 239 - 240 - static inline void writesl(const void __iomem *addr, const void *buf, int len) 241 - { 242 - outsl(addr - PCI_IOBASE, buf, len); 243 - } 244 - 245 - static inline void writesw(const void __iomem *addr, const void *buf, int len) 246 - { 247 - outsw(addr - PCI_IOBASE, buf, len); 248 - } 249 - 250 - static inline void writesb(const void __iomem *addr, const void *buf, int len) 251 - { 252 - outsb(addr - PCI_IOBASE, buf, len); 253 - } 254 225 255 226 #ifndef CONFIG_GENERIC_IOMAP 256 227 #define ioread8(addr) readb(addr)
+5 -1
include/asm-generic/mmu.h
··· 7 7 */ 8 8 #ifndef __ASSEMBLY__ 9 9 typedef struct { 10 - struct vm_list_struct *vmlist; 11 10 unsigned long end_brk; 11 + 12 + #ifdef CONFIG_BINFMT_ELF_FDPIC 13 + unsigned long exec_fdpic_loadmap; 14 + unsigned long interp_fdpic_loadmap; 15 + #endif 12 16 } mm_context_t; 13 17 #endif 14 18