From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v5 1/5] x86/crash: Fix up declaration of do_nmi_crash() Date: Fri, 28 Feb 2014 18:07:50 +0000 Message-ID: <1393610874-27492-2-git-send-email-andrew.cooper3@citrix.com> References: <1393610874-27492-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1393610874-27492-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper List-Id: xen-devel@lists.xenproject.org ... so it can correctly be annotated as noreturn. Move the declaration of nmi_crash() to be effectively private in crash.c Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- Changes in v5: * Move to start of series to fix bisection issue. --- xen/arch/x86/crash.c | 3 ++- xen/include/asm-x86/processor.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 01fd906..ec586bd 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -36,7 +36,7 @@ static unsigned int crashing_cpu; static DEFINE_PER_CPU_READ_MOSTLY(bool_t, crash_save_done); /* This becomes the NMI handler for non-crashing CPUs, when Xen is crashing. */ -void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs) +void do_nmi_crash(struct cpu_user_regs *regs) { int cpu = smp_processor_id(); @@ -113,6 +113,7 @@ void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs) halt(); } +void nmi_crash(void); static void nmi_shootdown_cpus(void) { unsigned long msecs; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f1cccff..4629b32 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -530,7 +530,6 @@ void do_ ## _name(struct cpu_user_regs *regs) DECLARE_TRAP_HANDLER(divide_error); DECLARE_TRAP_HANDLER(debug); DECLARE_TRAP_HANDLER(nmi); -DECLARE_TRAP_HANDLER(nmi_crash); DECLARE_TRAP_HANDLER(int3); DECLARE_TRAP_HANDLER(overflow); DECLARE_TRAP_HANDLER(bounds); @@ -551,6 +550,7 @@ DECLARE_TRAP_HANDLER(spurious_interrupt_bug); void trap_nop(void); void enable_nmis(void); +void __attribute__((noreturn)) do_nmi_crash(struct cpu_user_regs *regs); void syscall_enter(void); void sysenter_entry(void); -- 1.7.10.4