X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=Makefile;h=4c6c5e32ef96e3d12da975e682ee8a3f6ebc37e3;hb=ea837f1c050344c3f884531a195c6e339b1a54e8;hp=7a06c16602fd8e7f238d2beb14553a039897f0b9;hpb=398477d4bd57cc33792fd93035c2763ad78629c4;p=powerpc.git

diff --git a/Makefile b/Makefile
index 7a06c16602..4c6c5e32ef 100644
--- a/Makefile
+++ b/Makefile
@@ -936,7 +936,6 @@ headers_install: include/linux/version.h scripts_basic FORCE
 	  echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
 	  exit 1 ; fi
 	$(Q)$(MAKE) $(build)=scripts scripts/unifdef
-	$(Q)rm -rf $(INSTALL_HDR_PATH)/include
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include
 
 PHONY += headers_check
@@ -1386,9 +1385,13 @@ endif #ifeq ($(config-targets),1)
 endif #ifeq ($(mixed-targets),1)
 
 PHONY += checkstack kernelrelease kernelversion
+
+# Use $(SUBARCH) here instead of $(ARCH) so that this works for UML.
+# In the UML case, $(SUBARCH) is the name of the underlying
+# architecture, while for all other arches, it is the same as $(ARCH).
 checkstack:
 	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
-	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)
+	$(PERL) $(src)/scripts/checkstack.pl $(SUBARCH)
 
 kernelrelease:
 	$(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \