From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751443AbcIIFzn (ORCPT ); Fri, 9 Sep 2016 01:55:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37508 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751243AbcIIFzl (ORCPT ); Fri, 9 Sep 2016 01:55:41 -0400 Date: Thu, 8 Sep 2016 22:54:34 -0700 From: tip-bot for Ravi Bangoria Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, acme@redhat.com, ravi.bangoria@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, ravi.bangoria@linux.vnet.ibm.com, peterz@infradead.org, acme@redhat.com, mingo@kernel.org, alexander.shishkin@linux.intel.com, hpa@zytor.com In-Reply-To: <1472630591-5089-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com> References: <1472630591-5089-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf powerpc: Fix build-test failure Git-Commit-ID: 25b8592e912f085ce2ff736a2927584ddeab238c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 25b8592e912f085ce2ff736a2927584ddeab238c Gitweb: http://git.kernel.org/tip/25b8592e912f085ce2ff736a2927584ddeab238c Author: Ravi Bangoria AuthorDate: Wed, 31 Aug 2016 13:33:11 +0530 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 8 Sep 2016 13:44:07 -0300 perf powerpc: Fix build-test failure 'make -C tools/perf build-test' is failing with below log for poewrpc. In file included from /tmp/tmp.3eEwmGlYaF/perf-4.8.0-rc4/tools/perf/perf.h:15:0, from util/cpumap.h:8, from util/env.c:1: /tmp/tmp.3eEwmGlYaF/perf-4.8.0-rc4/tools/perf/perf-sys.h:23:56: fatal error: ../../arch/powerpc/include/uapi/asm/unistd.h: No such file or directory compilation terminated. I bisected it and found it's failing from commit ad430729ae00 ("Remove: kernel unistd*h files from perf's MANIFEST, not used"). Header file '../../arch/powerpc/include/uapi/asm/unistd.h' is included only for powerpc in tools/perf/perf-sys.h. By looking closly at commit history, I found little weird thing: Commit f2d9cae9ea9e ("perf powerpc: Use uapi/unistd.h to fix build error") replaced 'asm/unistd.h' with 'uapi/asm/unistd.h' Commit d2709c7ce4c5 ("perf: Make perf build for x86 with UAPI disintegration applied") removes all arch specific 'uapi/asm/unistd.h' for all archs and adds generic . Commit f0b9abfb0446 ("Merge branch 'linus' into perf/core") again includes 'uapi/asm/unistd.h' for powerpc. Don't know how exactly this happened as this change is not part of commit also. Signed-off-by: Ravi Bangoria Cc: Alexander Shishkin Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1472630591-5089-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com Fixes: ad430729ae00 ("Remove: kernel unistd*h files from perf's MANIFEST, not used") Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/perf-sys.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index 7ed72a4..e4b717e 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -20,7 +20,6 @@ #endif #ifdef __powerpc__ -#include "../../arch/powerpc/include/uapi/asm/unistd.h" #define CPUINFO_PROC {"cpu"} #endif