From patchwork Sat Jul 30 23:02:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Woodhouse X-Patchwork-Id: 1023132 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6UN2ueq024542 for ; Sat, 30 Jul 2011 23:02:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751904Ab1G3XCz (ORCPT ); Sat, 30 Jul 2011 19:02:55 -0400 Received: from casper.infradead.org ([85.118.1.10]:60217 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729Ab1G3XCz (ORCPT ); Sat, 30 Jul 2011 19:02:55 -0400 Received: from i7.infradead.org ([2001:8b0:10b:1:225:64ff:fee8:e9df]) by casper.infradead.org with esmtpsa (Exim 4.76 #1 (Red Hat Linux)) id 1QnIYW-0008ID-1J; Sat, 30 Jul 2011 23:02:52 +0000 Subject: [PATCH 4/5] um: Do not define SUBARCH in CFLAGS From: David Woodhouse To: Arnaud Lacombe Cc: "H. Peter Anvin" , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Date: Sun, 31 Jul 2011 00:02:50 +0100 In-Reply-To: <1312066693.22074.50.camel@i7.infradead.org> References: <1312066693.22074.50.camel@i7.infradead.org> X-Mailer: Evolution 3.0.2 (3.0.2-3.fc15) Message-ID: <1312066972.22074.55.camel@i7.infradead.org> Mime-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sat, 30 Jul 2011 23:02:56 +0000 (UTC) There are no users of this, and not a lot of reasons why people would *need* to use it when the compiler defines standard macros for the architecture anyway. Signed-off-by: David Woodhouse --- Did I miss somewhere that this is actually used? arch/um/Makefile | 2 +- arch/um/kernel/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/um/Makefile b/arch/um/Makefile index fab8121..2a54640 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -38,7 +38,7 @@ KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # # These apply to USER_CFLAGS to. -KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ +KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \ $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ -Din6addr_loopback=kernel_in6addr_loopback \ -Din6addr_any=kernel_in6addr_any diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile index c4491c1..48a4f9f 100644 --- a/arch/um/kernel/Makefile +++ b/arch/um/kernel/Makefile @@ -3,7 +3,7 @@ # Licensed under the GPL # -CPPFLAGS_vmlinux.lds := -U$(SUBARCH) -DSTART=$(LDS_START) \ +CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START) \ -DELF_ARCH=$(LDS_ELF_ARCH) \ -DELF_FORMAT=$(LDS_ELF_FORMAT) extra-y := vmlinux.lds