From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756066Ab2JZEdZ (ORCPT ); Fri, 26 Oct 2012 00:33:25 -0400 Received: from LGEMRELSE1Q.lge.com ([156.147.1.111]:60744 "EHLO LGEMRELSE1Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753403Ab2JZEdW convert rfc822-to-8bit (ORCPT ); Fri, 26 Oct 2012 00:33:22 -0400 X-AuditID: 9c93016f-b7c7bae000000eb7-6f-508a1290a818 From: Namhyung Kim To: David Howells Cc: Borislav Petkov , Arnaldo Carvalho de Melo , mingo@kernel.org, tglx@linutronix.de, davem@davemloft.net, torvalds@linux-foundation.org, paulus@samba.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Subject: Re: [RFC][PATCH 0/5] tools, perf: Fix up for x86 UAPI disintegration References: <20121024194619.GC17945@liondog.tnic> <20121019165558.23037.40181.stgit@warthog.procyon.org.uk> <20121024184337.GD13993@ghostprotocols.net> <8477.1351151840@warthog.procyon.org.uk> Date: Fri, 26 Oct 2012 13:33:19 +0900 In-Reply-To: <8477.1351151840@warthog.procyon.org.uk> (David Howells's message of "Thu, 25 Oct 2012 08:57:20 +0100") Message-ID: <87liet97jk.fsf@sejong.aot.lge.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi David, On Thu, 25 Oct 2012 08:57:20 +0100, David Howells wrote: > Borislav Petkov wrote: > >> David, where can get that x86 UAPI disintegration patch? > > The tip tree has it in branch x86/uapi or you can get it from: > > git://git.infradead.org/users/dhowells/linux-headers.git > > branch disintegrate-x86 or tag disintegrate-x86-20121009. > > I've posted a couple of additional patches to deal with files that became > empty, but they're only for dealing with people who construct their kernel > sources with the patch program. I applied this series on top of you disintegrate-x86 branch which has following commit. commit 8d2c63c2b664bae1fb0f386661ea5f635330e570 Author: David Howells Date: Tue Oct 9 09:47:54 2012 +0100 UAPI: (Scripted) Disintegrate arch/x86/include/asm Signed-off-by: David Howells Acked-by: Arnd Bergmann Acked-by: Thomas Gleixner Acked-by: Michael Kerrisk Acked-by: Paul E. McKenney Acked-by: Dave Jones But I got a conflict like this: --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@@ -112,7 -102,7 +102,11 @@@ void get_term_dimensions(struct winsiz #include #include ++<<<<<<< HEAD +#include "../../include/linux/perf_event.h" ++======= + #include ++>>>>>>> perf: Make perf build for x86 with UAPI disintegration applied #include "util/types.h" #include This was because your patch 3 has "uapi" between "include" and "linux". It seems I need more patches to apply your series since there's no perf_event.h under ../../include/uapi/linux directory. Anyways, resolving the conflict resulted in build error: CC builtin-kvm.o builtin-kvm.c:25:21: fatal error: asm/svm.h: No such file or directory make: *** [builtin-kvm.o] Error 1 CC util/evsel.o In file included from util/perf_regs.h:5:0, from util/evsel.c:23: arch/x86/include/perf_regs.h:6:27: fatal error: asm/perf_regs.h: No such file or directory make: *** [util/evsel.o] Error 1 CC util/rbtree.o ../../lib/rbtree.c:24:36: fatal error: linux/rbtree_augmented.h: No such file or directory make: *** [util/rbtree.o] Error 1 CC util/header.o util/header.c:2276:8: error: ‘PERF_ATTR_SIZE_VER3’ undeclared here (not in a function) make: *** [util/header.o] Error 1 Thanks, Namhyung