From patchwork Sun Jul 9 18:32:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 107243 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2538993qge; Sun, 9 Jul 2017 11:33:35 -0700 (PDT) X-Received: by 10.84.136.1 with SMTP id 1mr13941357plk.74.1499625215621; Sun, 09 Jul 2017 11:33:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499625215; cv=none; d=google.com; s=arc-20160816; b=TnE296gskQh3B/gnARWobj3MJyt3XhDVkRszetbWdrodI416V/sJTxl7JYF5kVr/qu vQx25RiRk8G3i/PDxn3j4SBSHXk++0mbmarvrozV4pjc1YBhwp50r+jl3yQAseA8bE5b eAnKTgS3qbfDG0Zsyr08eYe9du5HbdPVHqq+MWsB3XtfJUKt4ar5vxRSsmIMNPobf4Ox s8PuFY05g5+6PVDOWroV3ywPeyRoKgKgx1Ib8RlJLwqbgxq7R+pa3bYnqpJKGKOhRzkM HrFFBsFsU0CDL4oYWXzT0zscR23wUfS2YgW2ickyfwnbWKYY7r59DrqXPAJrTVX013Nr clHA== 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=KT6gok0Y9MhnbaGofciL/dXu5swWG/ZLT6YuqBcZGxg=; b=HzRhSS1R4asSk9KaJPadWnZ6nbSZb82AYfGyJwxr9KWlOTBCqhnW3gh2Fq9t/50KTw 4o9ZkotEgU/kv/P+8P5iMOUrZqu9DUCd6VwzBEzBp6+3cUcmgqfq90WRHBYOPKdCw3kB gyVbeMhFTg1EF/hvnje/HHCM9X3WmX35dk6XgXWfaYRgwlPsRUtPYuw+/ZSJ1ih7638+ 2LX3rVoFFaOB3fgdy6GFJunqxKQeJsTo9W6YBEExChiQrA4dsaJR3JR3rlruVrINeA0r fUrVG4QtFYE/hom3jV8eaE2sWWQOxrZrEj6h9v2lT5gE9TAQVZHqPnZ7ibNqtjY28iCW dX8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.b=hzdkXHsw; 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.35; Sun, 09 Jul 2017 11:33:35 -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=hzdkXHsw; 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 S1752686AbdGISd2 (ORCPT + 25 others); Sun, 9 Jul 2017 14:33:28 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:45816 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752631AbdGISdY (ORCPT ); Sun, 9 Jul 2017 14:33:24 -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 v69IX2DA000353; Mon, 10 Jul 2017 03:33:15 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v69IX2DA000353 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1499625195; bh=KT6gok0Y9MhnbaGofciL/dXu5swWG/ZLT6YuqBcZGxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hzdkXHswM+PRKQYb9efYIA7hUHitCWU+np0NkaCQoWyvOOcWwRU5biXJgU+Ze/kqI arFlvIHUNJIP9g1uhH/wfdUevu/XOjJ1RXMwR/s/tWkXtJkWjeVu6abAB2PwtS4kqW QjimLKG4vl7OY6Ah4JzkH0ZU7WzVMK8OK88zQVIUYDzLFYRSQSU7X/QK+SJzy+x2m+ ikIasqwXDJB9bZeSsCg+/7HJW+cG1aXIgmienBbT7DnfNdFSTwVFaJgadzXSbJQKpS rfUb9cibOJDLjsVmZ3rmvY+OzszD4TufbI0K9jzXWcz9uE/isiX5MUsV588Ykthntk 0x1BlYrrTpaRg== 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 14/28] m68k: move generic-y of exported headers to uapi/asm/Kbuild Date: Mon, 10 Jul 2017 03:32:46 +0900 Message-Id: <1499625180-8067-15-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 m68k, "generic-y += termios.h" is doubled in asm/Kbuild and uapi/asm/Kbuild. So, the one in the former can be simply removed. Also, move "generic-y += kprobes.h" up in order to keep the entries sorted. Signed-off-by: Masahiro Yamada Acked-by: Geert Uytterhoeven --- arch/m68k/include/asm/Kbuild | 13 +------------ arch/m68k/include/uapi/asm/Kbuild | 10 ++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index 5ecf4e47b2e2..59d6d0d38f67 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -1,36 +1,25 @@ generic-y += barrier.h -generic-y += bitsperlong.h generic-y += clkdev.h generic-y += device.h generic-y += emergency-restart.h -generic-y += errno.h generic-y += exec.h generic-y += extable.h generic-y += futex.h generic-y += hw_irq.h -generic-y += ioctl.h -generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h generic-y += kmap_types.h -generic-y += kvm_para.h +generic-y += kprobes.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 += percpu.h generic-y += preempt.h -generic-y += resource.h generic-y += sections.h -generic-y += shmparam.h generic-y += spinlock.h -generic-y += statfs.h -generic-y += termios.h generic-y += topology.h generic-y += trace_clock.h -generic-y += types.h generic-y += word-at-a-time.h generic-y += xor.h -generic-y += kprobes.h diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 68b45cc87e2c..3717b64a620d 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -2,11 +2,21 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += errno.h +generic-y += ioctl.h +generic-y += ipcbuf.h +generic-y += kvm_para.h +generic-y += mman.h generic-y += msgbuf.h +generic-y += resource.h generic-y += sembuf.h generic-y += shmbuf.h +generic-y += shmparam.h generic-y += siginfo.h generic-y += socket.h generic-y += sockios.h +generic-y += statfs.h generic-y += termbits.h generic-y += termios.h +generic-y += types.h