From patchwork Thu Oct 28 13:19:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 287572 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9SDJRmd027091 for ; Thu, 28 Oct 2010 13:19:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757464Ab0J1NT0 (ORCPT ); Thu, 28 Oct 2010 09:19:26 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:57168 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754324Ab0J1NT0 (ORCPT ); Thu, 28 Oct 2010 09:19:26 -0400 Received: by bwz11 with SMTP id 11so1519923bwz.19 for ; Thu, 28 Oct 2010 06:19:24 -0700 (PDT) Received: by 10.204.53.193 with SMTP id n1mr640682bkg.3.1288271964536; Thu, 28 Oct 2010 06:19:24 -0700 (PDT) Received: from shutemov.name (shutemov.name [188.40.19.243]) by mx.google.com with ESMTPS id m8sm462962faj.35.2010.10.28.06.19.17 (version=SSLv3 cipher=RC4-MD5); Thu, 28 Oct 2010 06:19:20 -0700 (PDT) From: "Kirill A. Shutsemov" To: Sam Ravnborg , David Woodhouse Cc: Michal Marek , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH] kbuild: do not remove a.out kvm.h and kvm_para.h on headers_install_all Date: Thu, 28 Oct 2010 16:19:10 +0300 Message-Id: <1288271950-17539-1-git-send-email-kirill@shutemov.name> X-Mailer: git-send-email 1.7.2.3 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.3 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Oct 2010 13:19:27 +0000 (UTC) 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