[Xen-changelog] merge?

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID e56b8040bc904c9618e75518bfe96776b1f71a3e
# Parent  b8ef0989b49e58444a2dd0d68135faeeaca75f19
# Parent  3dfea50f02d6a3d8b9319e7645befc63dbcd3e06
merge?

diff -r b8ef0989b49e -r e56b8040bc90 xen/arch/x86/cpu/amd.c
--- a/xen/arch/x86/cpu/amd.c    Thu Aug 25 09:50:20 2005
+++ b/xen/arch/x86/cpu/amd.c    Thu Aug 25 09:50:30 2005
@@ -39,7 +39,7 @@
  */
  
 extern void vide(void);
-__asm__(".align 4\nvide: ret");
+__asm__(".text\n.align 4\nvide: ret");
 
 static void __init init_amd(struct cpuinfo_x86 *c)
 {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog