From 4a15cb70f707815b0244941b9fb6ecd12652fedd Mon Sep 17 00:00:00 2001
From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Fri, 11 Mar 2011 21:59:38 +0100
Subject: [PATCH] --- yaml --- r: 234655 b: refs/heads/master c:
 371c394af27ab7d1e58a66bc19d9f1f3ac1f67b4 h: refs/heads/master i:   234653:
 debe369cff3030dae215243b65f9bd34a91b2131   234651:
 1987a316871e5ff9becdd6279ce9ffb0dfea9438   234647:
 42dd9cf7276077239130892f98182e60d5bed08b   234639:
 1e79ad9804fd611c334bb41a0d7cfb0e7034b8c2   234623:
 647b60f67870d9cb99c7d1315eea2ebc8cec780f v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/entry_64.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 12ffdc83a345..523715452fed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c49aa5bd1376939b40759a6da5ba6cf701702721
+refs/heads/master: 371c394af27ab7d1e58a66bc19d9f1f3ac1f67b4
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
index aed1ffbeb0c9..bbd5c80cb09b 100644
--- a/trunk/arch/x86/kernel/entry_64.S
+++ b/trunk/arch/x86/kernel/entry_64.S
@@ -1248,7 +1248,7 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
 	decl PER_CPU_VAR(irq_count)
 	jmp  error_exit
 	CFI_ENDPROC
-END(do_hypervisor_callback)
+END(xen_do_hypervisor_callback)
 
 /*
  * Hypervisor uses this for application faults while it executes.