From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261804AbVA0CSQ (ORCPT ); Wed, 26 Jan 2005 21:18:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261597AbVAZXpH (ORCPT ); Wed, 26 Jan 2005 18:45:07 -0500 Received: from www.ssc.unict.it ([151.97.230.9]:49158 "HELO ssc.unict.it") by vger.kernel.org with SMTP id S261954AbVAZTED (ORCPT ); Wed, 26 Jan 2005 14:04:03 -0500 Subject: [patch 1/1] uml: Kconfig_arch little cleanup (to merge before 2.6.11) To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, jdike@addtoit.com, user-mode-linux-devel@lists.sourceforge.net, blaisorblade@yahoo.it From: blaisorblade@yahoo.it Date: Wed, 26 Jan 2005 20:03:18 +0100 Message-Id: <20050126190318.B4F084AB0@zion> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org arch/um/Kconfig_arch is actually a symlink, so * Remove it from the tree. * Make sure it is removed during make mrproper. Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- linux-2.6.11-paolo/arch/um/Makefile | 8 ++++++-- linux-2.6.11/arch/um/Kconfig_arch | 16 ---------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff -L arch/um/Kconfig_arch -puN arch/um/Kconfig_arch~uml-quick-fix-Makefile /dev/null --- linux-2.6.11/arch/um/Kconfig_arch +++ /dev/null 2005-01-24 17:16:49.498209144 +0100 @@ -1,16 +0,0 @@ -config 64_BIT - bool - default n - -config TOP_ADDR - hex - default 0xc0000000 if !HOST_2G_2G - default 0x80000000 if HOST_2G_2G - -config 3_LEVEL_PGTABLES - bool "Three-level pagetables" - default n - help - Three-level pagetables will let UML have more than 4G of physical - memory. All the memory that can't be mapped directly will be treated - as high memory. diff -puN arch/um/Makefile~uml-quick-fix-Makefile arch/um/Makefile --- linux-2.6.11/arch/um/Makefile~uml-quick-fix-Makefile 2005-01-26 19:58:50.149680728 +0100 +++ linux-2.6.11-paolo/arch/um/Makefile 2005-01-26 19:58:50.152680272 +0100 @@ -20,8 +20,11 @@ SYMLINK_HEADERS := archparam.h system.h arch-signal.h module.h vm-flags.h SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header)) -# The "os" symlink is only used by arch/um/include/os.h, which includes +# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes # ../os/include/file.h +# +# These are cleaned up during mrproper. Please DO NOT fix it again, this is +# the Correct Thing(tm) to do! ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \ $(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h @@ -134,7 +137,8 @@ CLEAN_FILES += linux x.i gmon.out $(ARCH $(GEN_HEADERS) $(ARCH_DIR)/include/skas_ptregs.h MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \ - $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os + $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \ + $(ARCH_DIR)/Kconfig_arch archclean: $(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util _