Messages in this thread | | | Date | Fri, 18 Sep 2009 12:37:23 -0700 (PDT) | From | David Rientjes <> | Subject | Re: [PATCH] remove duplicate asm/mman.h files |
| |
On Fri, 18 Sep 2009, Arnd Bergmann wrote:
> diff --git a/arch/ia64/include/asm/mman.h b/arch/ia64/include/asm/mman.h > index cf55884..4459028 100644 > --- a/arch/ia64/include/asm/mman.h > +++ b/arch/ia64/include/asm/mman.h > @@ -8,21 +8,9 @@ > * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co > */ > > -#include <asm-generic/mman-common.h> > +#include <asm-generic/mman.h> > > -#define MAP_GROWSDOWN 0x00100 /* stack-like segment */ > -#define MAP_GROWSUP 0x00200 /* register stack-like segment */ > -#define MAP_DENYWRITE 0x00800 /* ETXTBSY */ > -#define MAP_EXECUTABLE 0x01000 /* mark it as an executable */ > -#define MAP_LOCKED 0x02000 /* pages are locked */ > -#define MAP_NORESERVE 0x04000 /* don't check for reservations */ > -#define MAP_POPULATE 0x08000 /* populate (prefault) pagetables */ > -#define MAP_NONBLOCK 0x10000 /* do not block on IO */ > -#define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ > -#define MAP_HUGETLB 0x40000 /* create a huge page mapping */ > - > -#define MCL_CURRENT 1 /* lock all current mappings */ > -#define MCL_FUTURE 2 /* lock all future mappings */ > +#define MAP_GROWSUP 0x0200 /* register stack-like segment */ > > #ifdef __KERNEL__ > #ifndef __ASSEMBLY__
ia64 doesn't use MAP_GROWSUP, so it's probably not necessary to carry it along with your cleanup.
| |