Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0264405b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7e65df38 fb9de7eb

arch/c6x/include/asm/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ generic-y += kdebug.h 
generic-y += kmap_types.h

generic-y += kmap_types.h

generic-y += local.h

generic-y += local.h

generic-y += mman.h

generic-y += mman.h

generic-y += mmu.h

generic-y += mmu_context.h

generic-y += mmu_context.h

generic-y += msgbuf.h

generic-y += msgbuf.h

generic-y += param.h

generic-y += param.h

arch/c6x/include/asm/mmu.h

deleted100644 → 0
+0 −22
Original line number Original line Diff line number Diff line 
/*

 *  Port on Texas Instruments TMS320C6x architecture

 *

 *  Copyright (C) 2004, 2009, 2010 Texas Instruments Incorporated

 *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  published by the Free Software Foundation.

 */

#ifndef _ASM_C6X_MMU_H

#define _ASM_C6X_MMU_H



typedef struct {

	unsigned long		end_brk;

#ifdef CONFIG_BINFMT_ELF_FDPIC

	unsigned long	exec_fdpic_loadmap;

	unsigned long	interp_fdpic_loadmap;

#endif

} mm_context_t;



#endif /* _ASM_C6X_MMU_H */

arch/h8300/include/asm/Kbuild

+1 −0
Original line number Original line Diff line number Diff line 




generic-y += clkdev.h

generic-y += clkdev.h

generic-y += exec.h

generic-y += exec.h

generic-y += mmu.h

generic-y += module.h

generic-y += module.h

generic-y += trace_clock.h
 
generic-y += trace_clock.h

arch/h8300/include/asm/mmu.h

deleted100644 → 0
+0 −10
Original line number Original line Diff line number Diff line 
#ifndef __MMU_H

#define __MMU_H



/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */



typedef struct {

	unsigned long		end_brk;

} mm_context_t;



#endif

arch/openrisc/include/asm/io.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define PIO_MASK		0

#define PIO_MASK		0





#include <asm-generic/io.h>

#include <asm-generic/io.h>

#include <asm/pgtable.h>





extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size,

extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size,

				pgprot_t prot);

				pgprot_t prot);