From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: Mangled commit in xen/next-2.6.38
Date: Wed, 09 Feb 2011 14:21:41 -0800
Message-ID: <4D531375.1030507@goop.org>
References: <alpine.LFD.2.02.1102092028550.32245@vega3.dur.ac.uk>
	<alpine.LFD.2.02.1102092109530.32245@vega3.dur.ac.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <alpine.LFD.2.02.1102092109530.32245@vega3.dur.ac.uk>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: M A Young <m.a.young@durham.ac.uk>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

On 02/09/2011 01:11 PM, M A Young wrote:
> On Wed, 9 Feb 2011, M A Young wrote:
>
>> Building current xen/next-2.6.38 fails, and it looks like commit
>> 11b0c549fc7a0b0cc6c14f50692696c5bcfb4754 is slightly mangled because
>> it puts the call to trace_xen_mmu_flush_tlb_single in the
>> xen_flush_tlb function and to trace_xen_mmu_flush_tlb in
>> xen_flush_tlb_single

Thanks.  That was only half-merged, and I've been meaning to test it
properly.

    J

>
> And there are further errors breaking the compile such as
> include/trace/events/xen.h: In function
> 'ftrace_raw_output_xen_mmu_set_pud':
> include/trace/events/xen.h:239:1: error: implicit declaration of
> function 'native_make_pud' [-Werror=implicit-function-declaration]
> include/trace/events/xen.h:239:1: error: request for member 'pgd' in
> something not a structure or union
> In file included from include/trace/ftrace.h:554:0,
>                  from include/trace/define_trace.h:96,
>                  from include/trace/events/xen.h:515,
>                  from arch/x86/xen/trace.c:63:
> include/trace/events/xen.h: In function
> 'ftrace_raw_event_xen_mmu_set_pud':
> include/trace/events/xen.h:239:1: error: 'pud_t' has no member named
> 'pud'
> In file included from include/trace/ftrace.h:758:0,
>                  from include/trace/define_trace.h:96,
>                  from include/trace/events/xen.h:515,
>                  from arch/x86/xen/trace.c:63:
> include/trace/events/xen.h: In function 'perf_trace_xen_mmu_set_pud':
> include/trace/events/xen.h:239:1: error: 'pud_t' has no member named
> 'pud'
>
>     Michael Young
>