diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/blackfin/include/asm/page.h | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/blackfin/include/asm/page.h')
| -rw-r--r-- | arch/blackfin/include/asm/page.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/page.h b/arch/blackfin/include/asm/page.h index 944a07c6cfd..1d04e407834 100644 --- a/arch/blackfin/include/asm/page.h +++ b/arch/blackfin/include/asm/page.h | |||
| @@ -10,4 +10,9 @@ | |||
| 10 | #include <asm-generic/page.h> | 10 | #include <asm-generic/page.h> |
| 11 | #define MAP_NR(addr) (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT) | 11 | #define MAP_NR(addr) (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT) |
| 12 | 12 | ||
| 13 | #define VM_DATA_DEFAULT_FLAGS \ | ||
| 14 | (VM_READ | VM_WRITE | \ | ||
| 15 | ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ | ||
| 16 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | ||
| 17 | |||
| 13 | #endif | 18 | #endif |