From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751419AbdHaFWo (ORCPT ); Thu, 31 Aug 2017 01:22:44 -0400 Received: from ozlabs.org ([103.22.144.67]:35161 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbdHaFWm (ORCPT ); Thu, 31 Aug 2017 01:22:42 -0400 Date: Thu, 31 Aug 2017 15:22:40 +1000 From: Stephen Rothwell To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: linux-next: build failure after merge of the xen-tip tree Message-ID: <20170831152240.125004d5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, After merging the xen-tip tree, today's linux-next build (x86_64 allmodconfig) failed like this: arch/x86/xen/xen-asm_64.o: In function `xen_trace_page_fault': (.text+0x174): undefined reference to `trace_page_fault' Caused by commit ad5b8c4ba323 ("xen: get rid of paravirt op adjust_exception_frame") interacting with commit 11a7ffb01703 ("x86/traps: Simplify pagefault tracing logic") from the tip tree. I am not sure how to fix up this, so I have just applied the following patch for today. A better solution would be appreciated. From: Stephen Rothwell Date: Thu, 31 Aug 2017 15:06:10 +1000 Subject: [PATCH] xen: fix for "x86/traps: Simplify pagefault tracing logic" Signed-off-by: Stephen Rothwell --- arch/x86/xen/enlighten_pv.c | 2 +- arch/x86/xen/xen-asm_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index b18d9b9f84c2..6ea983a9016d 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -618,7 +618,7 @@ static struct { { alignment_check, xen_alignment_check, false }, { simd_coprocessor_error, xen_simd_coprocessor_error, false }, #ifdef CONFIG_TRACING - { trace_page_fault, xen_trace_page_fault, false }, +// { trace_page_fault, xen_trace_page_fault, false }, #endif }; diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index 4ebac091a0e8..1c7a3df3e5a5 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -52,7 +52,7 @@ xen_pv_trap simd_coprocessor_error xen_pv_trap entry_INT80_compat #endif #ifdef CONFIG_TRACING -xen_pv_trap trace_page_fault +/* xen_pv_trap trace_page_fault */ #endif xen_pv_trap hypervisor_callback -- 2.13.2 -- Cheers, Stephen Rothwell