From patchwork Sun Jul 9 18:32:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 107242 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2538972qge; Sun, 9 Jul 2017 11:33:34 -0700 (PDT) X-Received: by 10.101.77.69 with SMTP id j5mr10892105pgt.133.1499625214018; Sun, 09 Jul 2017 11:33:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499625214; cv=none; d=google.com; s=arc-20160816; b=Va1lrybdlQukz+eBTZEex/zFCuLTDOkHKwnf3j4l1GhAiF0/xcwjfqow+yMEV2Q5qS z752+loAoMkdqH78+7LdKMPqJIVyQbexwS8NvqpJa2Gpu2ITFhCdsOGX7rEHNP3fqATb xhLnGcXy/SpOYcJ6uhLLaXwsH1zEPqhijA5V2H/54a5HB7wvsZsnuZ5yGdmRQd85fpIT W3CbfRBAZtYcOXThM82EfCotv39ImpQN0F6F2JkWj0SLC3fPrKRWwXAT27SU7T7uB9aA kjUCRS5rZWMXP79jBmC4O/2Qw9vhF8Ofybi+HeHKNlFrfzorKyJx76VAESlWUInCng5s 1FQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=IcIQvE7my7VjFDF/iAPk7nH/z9NjszH7iwo0JkstMj8=; b=tqBfAJeEvvFXnsPtn282YWB+0HQqmUFtL+lG9WgraVzQATvEFc0IRMZ4ZzQvX54yts jlJVZkjBPVu1llbKrJCj/SI+f/0viXPYvffSpiAdBKtHMzK3biu1oHJTRuC5ScQSgNk5 K35NzaExr8P8TxU3FUL6byEHhljem3qnqGVGDUO/X9ALMnIYAGS8COmReIrxpT9Lmpv8 SKWi6IM0W+LgIaczdOchreNM7jBYhoFrrE7lcsEz+0HQbgizAAhv4043AMbXirtOdHR9 0cv9IWw2K+aCFnIuanC/YgaPmiueyP4h8/+OQv95ehkHpIhFR2aDHqSr7BrQTmlvLaEo TgJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.b=sqATAUJY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z80si6375724pfk.418.2017.07.09.11.33.33; Sun, 09 Jul 2017 11:33:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.b=sqATAUJY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752653AbdGISdW (ORCPT + 25 others); Sun, 9 Jul 2017 14:33:22 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:45696 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752512AbdGISdR (ORCPT ); Sun, 9 Jul 2017 14:33:17 -0400 Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-08.nifty.com with ESMTP id v69IX2D0000353; Mon, 10 Jul 2017 03:33:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v69IX2D0000353 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1499625190; bh=IcIQvE7my7VjFDF/iAPk7nH/z9NjszH7iwo0JkstMj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sqATAUJYAHujpyUGZt7AiXg74jWKm2MyDdoHjGWrl0lYTX3rgfa2LjJD6HgHEa0aa dV2CoflqwV7hpZkAduZFr3ty2/mdAvjAItn4H+gMZaZX2oHzSrUygLhtOrAxu4V4ZQ LSY47QvcZCiGE+glrNw5PpHMPzMN88OwjaRjC16Frrk+c10IQjN4YNxUrQUG/e5CmC jLjnx5+jDLeEoigQf8HTkY56Rwe1AiSPLR/H3LBAyVS2TEPuHqsIXv+hRTRbVy4mtM ahZu1h9rLSe1m4hzUgyncWyCoxLg/F628qzRme/BNzIvhJLMgufOMZ4uaeU/XEwX/5 w4tpmvJGZuHOg== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 04/28] arm64: move generic-y of exported headers to uapi/asm/Kbuild Date: Mon, 10 Jul 2017 03:32:36 +0900 Message-Id: <1499625180-8067-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499625180-8067-1-git-send-email-yamada.masahiro@socionext.com> References: <1499625180-8067-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit fcc8487d477a ("uapi: export all headers under uapi directories"), all (and only) headers under uapi directories are exported, but asm-generic wrappers are still exceptions. To complete de-coupling the uapi from kernel headers, move generic-y of exported headers to uapi/asm/Kbuild. With this change, "make headers_install" will just need to parse uapi/asm/Kbuild to build up exported headers. For arm64, "generic-y += kvm_para.h" is doubled in asm/Kbuild and uapi/asm/Kbuild. So, the one in the former can be simply removed. Signed-off-by: Masahiro Yamada Acked-by: Catalin Marinas --- arch/arm64/include/asm/Kbuild | 17 ----------------- arch/arm64/include/uapi/asm/Kbuild | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) -- 2.7.4 diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild index a7a97a608033..f81c7b685fc6 100644 --- a/arch/arm64/include/asm/Kbuild +++ b/arch/arm64/include/asm/Kbuild @@ -6,41 +6,24 @@ generic-y += dma.h generic-y += dma-contiguous.h generic-y += early_ioremap.h generic-y += emergency-restart.h -generic-y += errno.h generic-y += hw_irq.h -generic-y += ioctl.h -generic-y += ioctls.h -generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h -generic-y += kvm_para.h generic-y += local.h generic-y += local64.h generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h -generic-y += mman.h -generic-y += msgbuf.h generic-y += msi.h -generic-y += poll.h generic-y += preempt.h -generic-y += resource.h generic-y += rwsem.h generic-y += segment.h -generic-y += sembuf.h generic-y += serial.h generic-y += set_memory.h -generic-y += shmbuf.h generic-y += simd.h generic-y += sizes.h -generic-y += socket.h -generic-y += sockios.h -generic-y += swab.h generic-y += switch_to.h -generic-y += termbits.h -generic-y += termios.h generic-y += trace_clock.h -generic-y += types.h generic-y += unaligned.h generic-y += user.h generic-y += vga.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 13a97aa2285f..fc28bd95c6d3 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -1,4 +1,20 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm +generic-y += errno.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h generic-y += kvm_para.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += poll.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += shmbuf.h +generic-y += socket.h +generic-y += sockios.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h