Commit 7213de04 authored by Richard Weinberger's avatar Richard Weinberger Committed by Linus Torvalds
Browse files

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: default avatarRichard Weinberger <richard@nod.at>
Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ec80e50

arch/um/sys-x86_64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# Licensed under the GPL

#



obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \

obj-y = bug.o bugs.o delay.o fault.o ldt.o ptrace.o ptrace_user.o \

	setjmp.o signal.o stub.o stub_segv.o syscalls.o syscall_table.o \

	sysrq.o ksyms.o tls.o

arch/um/sys-x86_64/mem.c

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/*

 * Copyright 2003 PathScale, Inc.

 *

 * Licensed under the GPL

 */



#include "linux/mm.h"

#include "asm/page.h"

#include "asm/mman.h"



unsigned long vm_stack_flags = __VM_STACK_FLAGS;

unsigned long vm_stack_flags32 = __VM_STACK_FLAGS;

unsigned long vm_data_default_flags = __VM_DATA_DEFAULT_FLAGS;

unsigned long vm_data_default_flags32 = __VM_DATA_DEFAULT_FLAGS;

unsigned long vm_force_exec32 = PROT_EXEC;

arch/um/sys-x86_64/shared/sysdep/vm-flags.h

+4 −22
Original line number Diff line number Diff line
@@ -7,27 +7,9 @@ 
#ifndef __VM_FLAGS_X86_64_H

#define __VM_FLAGS_X86_64_H



#define __VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \

#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \

	VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#define __VM_STACK_FLAGS 	(VM_GROWSDOWN | VM_READ | VM_WRITE | \

				 VM_EXEC | VM_MAYREAD | VM_MAYWRITE | \

				 VM_MAYEXEC)



extern unsigned long vm_stack_flags, vm_stack_flags32;

extern unsigned long vm_data_default_flags, vm_data_default_flags32;

extern unsigned long vm_force_exec32;



#ifdef TIF_IA32

#define VM_DATA_DEFAULT_FLAGS \

	(test_thread_flag(TIF_IA32) ? vm_data_default_flags32 : \

	  vm_data_default_flags)



#define VM_STACK_DEFAULT_FLAGS \

	(test_thread_flag(TIF_IA32) ? vm_stack_flags32 : vm_stack_flags)

#endif



#define VM_DATA_DEFAULT_FLAGS vm_data_default_flags



#define VM_STACK_DEFAULT_FLAGS vm_stack_flags

#define VM_STACK_DEFAULT_FLAGS (VM_GROWSDOWN | VM_READ | VM_WRITE | \

	VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE