diff options
| author | Richard Weinberger <richard@nod.at> | 2011-07-25 20:12:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 23:57:12 -0400 |
| commit | 7213de044e11856f5c2aee0e43eff8dc507d421c (patch) | |
| tree | 067513cfdc770448d9677bd69a385bb54b76ae38 /arch/um/sys-x86_64/shared/sysdep/vm-flags.h | |
| parent | 5ec80e50e11bcc3f39e47b9dc73110dbc58e4780 (diff) | |
um: clean up vm-flags.h
There is no need to define VM_{STACK,DATA}_DEFAULT_FLAGS as variable.
It's also useless to test for TIF_IA32 as 64bit UML has no IA32 emulation.
Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/sys-x86_64/shared/sysdep/vm-flags.h')
| -rw-r--r-- | arch/um/sys-x86_64/shared/sysdep/vm-flags.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/arch/um/sys-x86_64/shared/sysdep/vm-flags.h b/arch/um/sys-x86_64/shared/sysdep/vm-flags.h index 3213edfa7888..3978e55132d2 100644 --- a/arch/um/sys-x86_64/shared/sysdep/vm-flags.h +++ b/arch/um/sys-x86_64/shared/sysdep/vm-flags.h | |||
| @@ -7,27 +7,9 @@ | |||
| 7 | #ifndef __VM_FLAGS_X86_64_H | 7 | #ifndef __VM_FLAGS_X86_64_H |
| 8 | #define __VM_FLAGS_X86_64_H | 8 | #define __VM_FLAGS_X86_64_H |
| 9 | 9 | ||
| 10 | #define __VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 10 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
| 11 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 11 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 12 | #define __VM_STACK_FLAGS (VM_GROWSDOWN | VM_READ | VM_WRITE | \ | 12 | #define VM_STACK_DEFAULT_FLAGS (VM_GROWSDOWN | VM_READ | VM_WRITE | \ |
| 13 | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | \ | 13 | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 14 | VM_MAYEXEC) | ||
| 15 | |||
| 16 | extern unsigned long vm_stack_flags, vm_stack_flags32; | ||
| 17 | extern unsigned long vm_data_default_flags, vm_data_default_flags32; | ||
| 18 | extern unsigned long vm_force_exec32; | ||
| 19 | |||
| 20 | #ifdef TIF_IA32 | ||
| 21 | #define VM_DATA_DEFAULT_FLAGS \ | ||
| 22 | (test_thread_flag(TIF_IA32) ? vm_data_default_flags32 : \ | ||
| 23 | vm_data_default_flags) | ||
| 24 | |||
| 25 | #define VM_STACK_DEFAULT_FLAGS \ | ||
| 26 | (test_thread_flag(TIF_IA32) ? vm_stack_flags32 : vm_stack_flags) | ||
| 27 | #endif | ||
| 28 | |||
| 29 | #define VM_DATA_DEFAULT_FLAGS vm_data_default_flags | ||
| 30 | |||
| 31 | #define VM_STACK_DEFAULT_FLAGS vm_stack_flags | ||
| 32 | 14 | ||
| 33 | #endif | 15 | #endif |