Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932187Ab1FPTfs (ORCPT ); Thu, 16 Jun 2011 15:35:48 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:32173 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757775Ab1FPTfq (ORCPT ); Thu, 16 Jun 2011 15:35:46 -0400 Date: Thu, 16 Jun 2011 12:27:38 -0700 From: Randy Dunlap To: Richard Weinberger Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, randy.dunlap@oracle.com, mhocko@suse.cz, torvalds@linux-foundation.org Subject: Re: [PATCH] um: Clean up vm-flags.h Message-Id: <20110616122738.697a7c12.randy.dunlap@oracle.com> In-Reply-To: <1308250867-12497-1-git-send-email-richard@nod.at> References: <1308250867-12497-1-git-send-email-richard@nod.at> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Source-IP: acsinet22.oracle.com [141.146.126.238] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090205.4DFA5941.00B6:SCFMA922111,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3584 Lines: 105 On Thu, 16 Jun 2011 21:01:07 +0200 Richard Weinberger wrote: > 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 > CC: randy.dunlap@oracle.com Acked-by: Randy Dunlap Thanks. > CC: mhocko@suse.cz > CC: torvalds@linux-foundation.org > --- > arch/um/sys-x86_64/Makefile | 2 +- > arch/um/sys-x86_64/mem.c | 16 ---------------- > arch/um/sys-x86_64/shared/sysdep/vm-flags.h | 26 ++++---------------------- > 3 files changed, 5 insertions(+), 39 deletions(-) > delete mode 100644 arch/um/sys-x86_64/mem.c > > diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile > index c1ea9eb..63fe0d2 100644 > --- a/arch/um/sys-x86_64/Makefile > +++ b/arch/um/sys-x86_64/Makefile > @@ -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 > > diff --git a/arch/um/sys-x86_64/mem.c b/arch/um/sys-x86_64/mem.c > deleted file mode 100644 > index 3f8df8a..0000000 > --- a/arch/um/sys-x86_64/mem.c > +++ /dev/null > @@ -1,16 +0,0 @@ > -/* > - * 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; > - > 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 3213edf..3978e55 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 @@ > #ifndef __VM_FLAGS_X86_64_H > #define __VM_FLAGS_X86_64_H > > -#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_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ > + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) > +#define VM_STACK_DEFAULT_FLAGS (VM_GROWSDOWN | VM_READ | VM_WRITE | \ > + VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) > > #endif > -- --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/