[PATCH 1/3] arch/um/Makefile: remove dead code

From: Ramkumar Ramachandra
Date: Thu Jul 04 2013 - 17:07:20 EST


arch/um/Makefile is included in the toplevel Makefile:495. Well before
that, it unconditionally sets $SUBARCH (in Makefile:168) as follows:

SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
-e s/sun4u/sparc64/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )

It is clearly impossible for $SUBARCH to be set as i386 or x86_64.
Therefore, any code that checks $SUBARCH against these values is dead
code.

Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Richard Weinberger <richard@xxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
arch/um/Makefile | 9 ---------
1 file changed, 9 deletions(-)

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 133f7de..cf09cbf 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -22,15 +22,6 @@ MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas

HEADER_ARCH := $(SUBARCH)

-# Additional ARCH settings for x86
-ifeq ($(SUBARCH),i386)
- HEADER_ARCH := x86
-endif
-ifeq ($(SUBARCH),x86_64)
- HEADER_ARCH := x86
- KBUILD_CFLAGS += -mcmodel=large
-endif
-
HOST_DIR := arch/$(HEADER_ARCH)

include $(srctree)/$(ARCH_DIR)/Makefile-skas
--
1.8.3.1.643.gebeea52.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/