From patchwork Mon Jun 12 03:26:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 103583 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp13150qgd; Sun, 11 Jun 2017 20:28:52 -0700 (PDT) X-Received: by 10.99.109.141 with SMTP id i135mr29877161pgc.103.1497238132680; Sun, 11 Jun 2017 20:28:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497238132; cv=none; d=google.com; s=arc-20160816; b=yUSCwZaRJ9IquLoFwN0Tj6mBBqcyJ1tfQlFn1qLJIpjDtWtNVP2nnvPeahx+o5T69j 1Lp+o9ZtVDmgKpisxXFoATzFFjS3Tmap5ImPs9qQy6ofHAkC/sB6DUDTvqJLuedwkeWe diq7yEdiD9LXS7tnKQG8DFO/WYAXFpKhhbS3/gFVUnJOrO1uNNWJqdAysdmuuLNyM7wY RoqHzKFdiQMGuyC3XasusA1QmkHPVD3IRw0SUnBZ5E9HwwAhL6evW1O4LCi6Zu0UkHNg 2nR1k7mhkgETcN2ca+PANvSfhsaIKZAgGiOf6GQPpgF4IMTGU3b2jGC++b57baL+M77R eqUg== 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=pILD20Z+SmwySTA4BYUUhhMGcEGjaByEl0xD3JzCfYI=; b=HnSWJtgw8qTgPzS7k4P7WHiTo+ToEjAclfRaR3EPKD6AyBIl8J0rStWx4o/azxSDr7 vYHEJtT3/0J1I+FdV21fxOvJIpSBKXHWIHGoBEPXIWZYzMeFtZqu2zdGGGqMLlz6Hh0z VaQYNYbvuIPOD8F1KjHILfPKvqpu//cfuOLKCRYVb8JgZoEFtrymlnBBdPx/YNp5WncH nDkNoW27GCd6jrYRg2qZsYVkybJChBpY0MWXj79Dvj8s+MlXZRIj1YqkZaKPTqdlNczw 3nQ46O1GDW8lKGx4fhpdvpCrYCgjzJ/UkeKGo9ts7c97AiwRJ+CA+WGNBM18KUEWSXxo IPhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com; 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 1si12043848pgs.356.2017.06.11.20.28.52; Sun, 11 Jun 2017 20:28:52 -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; 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 S1752290AbdFLD2l (ORCPT + 25 others); Sun, 11 Jun 2017 23:28:41 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:65063 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752269AbdFLD2j (ORCPT ); Sun, 11 Jun 2017 23:28:39 -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 v5C3RXP4001077; Mon, 12 Jun 2017 12:27:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v5C3RXP4001077 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1497238059; bh=pILD20Z+SmwySTA4BYUUhhMGcEGjaByEl0xD3JzCfYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qhqYimIM2JzrIDmiPBzVNUyOK7hGs9d7/F+qp4E2bdTyBn+q0pxYfimmmwi0iHXkl bftHenKWFRbbYpDL6irmYX23uCnLB1Zef9sNRxT2ZViyykYg0t+fBpG90K53bIGlDL JSaJIFF2xDxkF3G8gIKZz+gRac3lPgYUwcVMaO2WNbhax/SQmHUE2b3QC4Q3xl2T6U Sn4IuFKigShxiwBDSnsc0q9/EVoU/OOkFkB9td+6zh+1EVi3Sp7OZ/StmzDQwVGuWB QW3wlFWrGRQbZuaExXST7DTRhH4dKVLk1Z0UaK1jm2STDFIVLD54f0OaobX1lPrDK2 1IwxNZiUgHYgg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org, linux-arch Cc: Masahiro Yamada , Will Deacon , Catalin Marinas , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/27] arm64: move generic-y of exported headers to uapi/asm/Kbuild Date: Mon, 12 Jun 2017 12:26:58 +0900 Message-Id: <1497238041-7011-5-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-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. 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. 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 --- arch/arm64/include/asm/Kbuild | 17 ----------------- arch/arm64/include/uapi/asm/Kbuild | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) -- 2.7.4 Acked-by: Catalin Marinas 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