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

Commit fa29f5ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

Pull asm-generic updates from Arnd Bergmann:
 "Only a few small changes this time:

   - Michael S. Tsirkin cleans up linux/mman.h

   - Mike Rapoport found a typo

  I had originally merged another cleanup series for I/O accessors from
  Hugo Lefeuvre as well, but dropped it after the discussion of the
  barrier semantics and some conflicts. I expect this series to get
  merged for a later release though"

* tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic/page.h: fix typo in #error text requiring a real asm/page.h
  arch: move common mmap flags to linux/mman.h
  drm: tweak header name
  x86/mpx: tweak header name
parents 78e10b5e d724444a

arch/alpha/include/uapi/asm/mman.h

+1 −3
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ 
#define PROT_GROWSDOWN	0x01000000	/* mprotect flag: extend change to start of growsdown vma */

#define PROT_GROWSUP	0x02000000	/* mprotect flag: extend change to end of growsup vma */



#define MAP_SHARED	0x01		/* Share changes */

#define MAP_PRIVATE	0x02		/* Changes are private */

#define MAP_SHARED_VALIDATE 0x03	/* share + validate extension flags */

/* 0x01 - 0x03 are defined in linux/mman.h */

#define MAP_TYPE	0x0f		/* Mask for type of mapping (OSF/1 is _wrong_) */

#define MAP_FIXED	0x100		/* Interpret addr exactly */

#define MAP_ANONYMOUS	0x10		/* don't use a file */

arch/mips/include/uapi/asm/mman.h

+1 −3
Original line number Diff line number Diff line
@@ -27,9 +27,7 @@ 
/*

 * Flags for mmap

 */

#define MAP_SHARED	0x001		/* Share changes */

#define MAP_PRIVATE	0x002		/* Changes are private */

#define MAP_SHARED_VALIDATE 0x003	/* share + validate extension flags */

/* 0x01 - 0x03 are defined in linux/mman.h */

#define MAP_TYPE	0x00f		/* Mask for type of mapping */

#define MAP_FIXED	0x010		/* Interpret addr exactly */

arch/parisc/include/uapi/asm/mman.h

+1 −3
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ 
#define PROT_GROWSDOWN	0x01000000	/* mprotect flag: extend change to start of growsdown vma */

#define PROT_GROWSUP	0x02000000	/* mprotect flag: extend change to end of growsup vma */



#define MAP_SHARED	0x01		/* Share changes */

#define MAP_PRIVATE	0x02		/* Changes are private */

#define MAP_SHARED_VALIDATE 0x03	/* share + validate extension flags */

/* 0x01 - 0x03 are defined in linux/mman.h */

#define MAP_TYPE	0x2b		/* Mask for type of mapping, includes bits 0x08 and 0x20 */

#define MAP_FIXED	0x04		/* Interpret addr exactly */

#define MAP_ANONYMOUS	0x10		/* don't use a file */

arch/x86/mm/mpx.c

+1 −1
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/mm_types.h>

#include <linux/mman.h>

#include <linux/syscalls.h>

#include <linux/sched/sysctl.h>



#include <asm/insn.h>

#include <asm/insn-eval.h>

#include <asm/mman.h>

#include <asm/mmu_context.h>

#include <asm/mpx.h>

#include <asm/processor.h>

arch/xtensa/include/uapi/asm/mman.h

+1 −3
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ 
/*

 * Flags for mmap

 */

#define MAP_SHARED	0x001		/* Share changes */

#define MAP_PRIVATE	0x002		/* Changes are private */

#define MAP_SHARED_VALIDATE 0x003	/* share + validate extension flags */

/* 0x01 - 0x03 are defined in linux/mman.h */

#define MAP_TYPE	0x00f		/* Mask for type of mapping */

#define MAP_FIXED	0x010		/* Interpret addr exactly */