uml: remove TOPDIR

TOPDIR is obsolete, use srctree instead.  This patch removes TOPDIR from all
UML Makefiles.

Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/um/Makefile b/arch/um/Makefile
index fb8854a9a5422606410742237ef80f495a4ab4da..cb4af9bf20747bf06b572c669589e1dd0d543c87 100644 (file)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -160,7 +160,7 @@ ifneq ($(KBUILD_SRC),)
        $(Q)mkdir -p $(objtree)/include/asm-um
        $(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
 else
-       $(Q)cd $(TOPDIR)/$(dir $@) ; \
+       $(Q)cd $(srctree)/$(dir $@) ; \
        ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $(notdir $@)
 endif
 
@@ -170,7 +170,7 @@ ifneq ($(KBUILD_SRC),)
        $(Q)mkdir -p $(objtree)/include/asm-um
        $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch
 else
-       $(Q)cd $(TOPDIR)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch
+       $(Q)cd $(srctree)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch
 endif
 
 $(objtree)/$(ARCH_DIR)/include:

diff --git a/arch/um/sys-ppc/Makefile b/arch/um/sys-ppc/Makefile
index a9814a7ae60efb1a6690a00b97f0ad01e7850697..08901526e893bda363b59246f8b22b3c3745b697 100644 (file)
--- a/arch/um/sys-ppc/Makefile
+++ b/arch/um/sys-ppc/Makefile
@@ -6,7 +6,7 @@ OBJ = built-in.o
 OBJS = ptrace.o sigcontext.o semaphore.o checksum.o miscthings.o misc.o \
        ptrace_user.o sysrq.o
 
-EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(TOPDIR)/arch/ppc/kernel
+EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
 
 all: $(OBJ)
 
@@ -22,25 +22,25 @@ sigcontext.o: sigcontext.c
 
 semaphore.c:
        rm -f $@
-       ln -s $(TOPDIR)/arch/ppc/kernel/$@ $@
+       ln -s $(srctree)/arch/ppc/kernel/$@ $@
 
 checksum.S:
        rm -f $@
-       ln -s $(TOPDIR)/arch/ppc/lib/$@ $@
+       ln -s $(srctree)/arch/ppc/lib/$@ $@
 
 mk_defs.c:
        rm -f $@
-       ln -s $(TOPDIR)/arch/ppc/kernel/$@ $@
+       ln -s $(srctree)/arch/ppc/kernel/$@ $@
 
 ppc_defs.head:
        rm -f $@
-       ln -s $(TOPDIR)/arch/ppc/kernel/$@ $@
+       ln -s $(srctree)/arch/ppc/kernel/$@ $@
 
 ppc_defs.h: mk_defs.c ppc_defs.head \
-               $(TOPDIR)/include/asm-ppc/mmu.h \
-               $(TOPDIR)/include/asm-ppc/processor.h \
-               $(TOPDIR)/include/asm-ppc/pgtable.h \
-               $(TOPDIR)/include/asm-ppc/ptrace.h
+               $(srctree)/include/asm-ppc/mmu.h \
+               $(srctree)/include/asm-ppc/processor.h \
+               $(srctree)/include/asm-ppc/pgtable.h \
+               $(srctree)/include/asm-ppc/ptrace.h
 #      $(CC) $(CFLAGS) -S mk_defs.c
        cp ppc_defs.head ppc_defs.h
 # for bk, this way we can write to the file even if it's not checked out
@@ -56,13 +56,13 @@ ppc_defs.h: mk_defs.c ppc_defs.head \
 
 checksum.o: checksum.S
        rm -f asm
-       ln -s $(TOPDIR)/include/asm-ppc asm
+       ln -s $(srctree)/include/asm-ppc asm
        $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
        rm -f asm
 
 misc.o: misc.S ppc_defs.h
        rm -f asm
-       ln -s $(TOPDIR)/include/asm-ppc asm
+       ln -s $(srctree)/include/asm-ppc asm
        $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
        rm -f asm