public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Juergen Gross <jgross@suse•com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
	Stefano Stabellini <sstabellini@kernel•org>,
	Boris Ostrovsky <boris.ostrovsky@oracle•com>,
	Xen Devel <Xen-devel@lists•xensource.com>,
	Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
	"H. Peter Anvin" <hpa@zytor•com>,
	Peter Zijlstra <peterz@infradead•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: build failure after merge of the xen-tip tree
Date: Thu, 31 Aug 2017 15:22:40 +1000	[thread overview]
Message-ID: <20170831152240.125004d5@canb.auug.org.au> (raw)

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 <sfr@canb•auug.org.au>
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 <sfr@canb•auug.org.au>
---
 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

             reply	other threads:[~2017-08-31  5:22 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-31  5:22 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-03-04 14:27 linux-next: build failure after merge of the xen-tip tree Mark Brown
2026-03-04 14:37 ` Jürgen Groß
2024-09-12  6:13 Stephen Rothwell
2024-09-12  6:29 ` Jürgen Groß
2024-09-11  6:04 Stephen Rothwell
2021-09-15  1:11 Stephen Rothwell
2018-07-30  5:12 Stephen Rothwell
2018-07-30  7:40 ` Oleksandr Andrushchenko
2018-08-16  0:09 ` Stephen Rothwell
2015-04-13  8:09 Stephen Rothwell
2015-04-13  8:36 ` Bob Liu
2015-04-15  5:00   ` Stephen Rothwell
2015-04-15 10:03   ` David Vrabel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170831152240.125004d5@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=Xen-devel@lists$(echo .)xensource.com \
    --cc=boris.ostrovsky@oracle$(echo .)com \
    --cc=hpa@zytor$(echo .)com \
    --cc=jgross@suse$(echo .)com \
    --cc=konrad.wilk@oracle$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mingo@elte$(echo .)hu \
    --cc=peterz@infradead$(echo .)org \
    --cc=sstabellini@kernel$(echo .)org \
    --cc=tglx@linutronix$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox