diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-02 23:40:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-02 23:40:16 -0800 |
| commit | d47a6240459ca4045a68a71aa2e304a682c1f1c8 (patch) | |
| tree | 31e8db580bd8cc1aa258c31ece7dfa4bb3628827 /include | |
| parent | f48bbcdf2231f55dd0404de24220e41ccb48e4c7 (diff) | |
| parent | 9a44391f29506cdf869b5b13251f79be7c3ba605 (diff) | |
Merge bk://bk.arm.linux.org.uk
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-sa1100/badge4.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/mman.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/arch-sa1100/badge4.h b/include/asm-arm/arch-sa1100/badge4.h index 5d9177fa7837..8d7a671492db 100644 --- a/include/asm-arm/arch-sa1100/badge4.h +++ b/include/asm-arm/arch-sa1100/badge4.h @@ -68,6 +68,7 @@ #define BADGE4_5V_PCMCIA_SOCK1 (1<<1) #define BADGE4_5V_PCMCIA_SOCK(n) (1<<(n)) #define BADGE4_5V_USB (1<<2) +#define BADGE4_5V_INITIALLY (1<<3) #ifndef __ASSEMBLY__ extern void badge4_set_5V(unsigned subsystem, int on); diff --git a/include/asm-arm/mman.h b/include/asm-arm/mman.h index 0c72de97d419..044a5ef62548 100644 --- a/include/asm-arm/mman.h +++ b/include/asm-arm/mman.h @@ -18,6 +18,8 @@ #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ #define MAP_LOCKED 0x2000 /* pages are locked */ #define MAP_NORESERVE 0x4000 /* don't check for reservations */ +#define MAP_POPULATE 0x8000 /* populate (prefault) page tables */ +#define MAP_NONBLOCK 0x10000 /* do not block on IO */ #define MS_ASYNC 1 /* sync memory asynchronously */ #define MS_INVALIDATE 2 /* invalidate the caches */ |