kbuild: do not remove a.out kvm.h and kvm_para.h on headers_install_all

Commit Message

Kirill A . Shutemov Oct. 28, 2010, 1:19 p.m. UTC

None

Patch

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 831c463..8be1246 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -19,15 +19,17 @@  header-y += wimax/
 
 objhdr-y += version.h
 
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
+# KBUILD_HEADERS is needed to avoid removing these headers on headers_install_all
+
+ifneq ($(KBUILD_HEADERS)$(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
 		  $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
 header-y += a.out.h
 endif
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
+ifneq ($(KBUILD_HEADERS)$(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
 		  $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 header-y += kvm.h
 endif
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
+ifneq ($(KBUILD_HEADERS)$(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
 		  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
 header-y += kvm_para.h
 endif