diff -ur xen/arch/x86/boot/x86_32.S xen/arch/x86/boot/x86_32.S
--- xen/arch/x86/boot/x86_32.S  2006-08-09 14:41:24.000000000 +0100
+++ xen/arch/x86/boot/x86_32.S  2006-08-09 15:57:00.000000000 +0100
@@ -261,3 +261,7 @@
 .section ".bss.stack_aligned","w"
 ENTRY(cpu0_stack)
         .fill STACK_SIZE,1,0
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff -ur xen/arch/x86/hvm/svm/x86_32/exits.S xen/arch/x86/hvm/svm/x86_32/exits.S
--- xen/arch/x86/hvm/svm/x86_32/exits.S 2006-08-09 14:41:24.000000000 +0100
+++ xen/arch/x86/hvm/svm/x86_32/exits.S 2006-08-09 15:59:20.000000000 +0100
@@ -157,3 +157,7 @@
         sti
         call do_softirq
         jmp  svm_test_all_events
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff -ur xen/arch/x86/hvm/vmx/x86_32/exits.S xen/arch/x86/hvm/vmx/x86_32/exits.S
--- xen/arch/x86/hvm/vmx/x86_32/exits.S 2006-08-09 14:41:24.000000000 +0100
+++ xen/arch/x86/hvm/vmx/x86_32/exits.S 2006-08-09 15:59:43.000000000 +0100
@@ -147,3 +147,7 @@

 ENTRY(vmx_asm_do_relaunch)
     vmx_asm_common 1, 1
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff -ur xen/arch/x86/trampoline.S xen/arch/x86/trampoline.S
--- xen/arch/x86/trampoline.S   2006-08-09 14:41:24.000000000 +0100
+++ xen/arch/x86/trampoline.S   2006-08-09 15:51:27.000000000 +0100
@@ -65,3 +65,7 @@
 ENTRY(trampoline_end)

 #endif /* CONFIG_SMP */
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff -ur xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_32/entry.S
--- xen/arch/x86/x86_32/entry.S 2006-08-09 14:41:24.000000000 +0100
+++ xen/arch/x86/x86_32/entry.S 2006-08-09 15:54:38.000000000 +0100
@@ -686,3 +686,7 @@
         .rept NR_hypercalls-(.-hypercall_args_table)
         .byte 0 /* do_ni_hypercall      */
         .endr
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif