From patchwork Mon Jun 12 03:27:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9780355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C0666038F for ; Mon, 12 Jun 2017 03:30:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1B012521E for ; Mon, 12 Jun 2017 03:30:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E66F5262AE; Mon, 12 Jun 2017 03:30:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98F5D2521E for ; Mon, 12 Jun 2017 03:30:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752017AbdFLD2L (ORCPT ); Sun, 11 Jun 2017 23:28:11 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:64083 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752156AbdFLD2J (ORCPT ); Sun, 11 Jun 2017 23:28:09 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v5C3RXPK001077; Mon, 12 Jun 2017 12:27:49 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v5C3RXPK001077 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1497238070; bh=eSNG2erRQ+ynYiGe+7544KAW5Rdx11F79GS9jdsvBvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yhdwFplDirQVNB9sMt2I5k1YMd3qyZGUmHCkkYA2vroSz/veqA+w1936mBFQ3Cg7o 6lhiPXzD0OubbIhDzLTHucta5B0qdpXeyAzF24At7HWVdM42IPZIo4/0M/DoPHCRIy n+oc5D6DBZLRb0HO5ffOvxZR8IAsUu5xzFOPFtM5nbBKbPIlXgOGdHhf10UazlElX3 gbFOqtCWcMBJWxsp979caLVAPvVrZ28fllK+vIBpo2y3K+7GIah9FSy/uL3gi6sK8X Q8jUobVzfot+6F5S23TSTiNA0VZFOH/qaJs32d5b1mQTxq3OtHGfbGqJjuNJVi035X B3oa8beoYASog== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org, linux-arch Cc: Masahiro Yamada , Yoshinori Sato , Rich Felker , linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 20/27] sh: move generic-y of exported headers to uapi/asm/Kbuild Date: Mon, 12 Jun 2017 12:27:14 +0900 Message-Id: <1497238041-7011-21-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497238041-7011-1-git-send-email-yamada.masahiro@socionext.com> References: <1497238041-7011-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. scripts/Makefile.headersinst still need to deal with old-kbuild-file for headers listed in arch/*/include/asm/Kbuild, but actually exported. As the last work to finish de-coupling the uapi from kernel headers, move generic-y of exported headers to uapi/asm/Kbuild. Signed-off-by: Masahiro Yamada --- arch/sh/include/asm/Kbuild | 20 -------------------- arch/sh/include/uapi/asm/Kbuild | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild index cf2a75063b53..1a6f9c39feef 100644 --- a/arch/sh/include/asm/Kbuild +++ b/arch/sh/include/asm/Kbuild @@ -1,40 +1,20 @@ - -generic-y += bitsperlong.h generic-y += clkdev.h generic-y += current.h generic-y += delay.h generic-y += div64.h generic-y += emergency-restart.h -generic-y += errno.h generic-y += exec.h -generic-y += fcntl.h -generic-y += ioctl.h -generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += irq_work.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 += param.h generic-y += parport.h generic-y += percpu.h -generic-y += poll.h generic-y += preempt.h -generic-y += resource.h generic-y += rwsem.h -generic-y += sembuf.h generic-y += serial.h -generic-y += shmbuf.h -generic-y += siginfo.h generic-y += sizes.h -generic-y += socket.h -generic-y += statfs.h -generic-y += termbits.h -generic-y += termios.h generic-y += trace_clock.h -generic-y += ucontext.h generic-y += xor.h diff --git a/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index b15bf6bc0e94..e28531333efa 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,2 +1,22 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm + +generic-y += bitsperlong.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ipcbuf.h +generic-y += kvm_para.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += shmbuf.h +generic-y += siginfo.h +generic-y += socket.h +generic-y += statfs.h +generic-y += termbits.h +generic-y += termios.h +generic-y += ucontext.h