rpms/kernel-xen-2.6/devel linux-2.6-xen-execshield.patch, 1.3.10.1, 1.3.10.2

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13356

Modified Files:
      Tag: private-ehabkost-xen310-branch
	linux-2.6-xen-execshield.patch 
Log Message:
Update xen-execshield patch correctly


linux-2.6-xen-execshield.patch:

Index: linux-2.6-xen-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-xen-execshield.patch,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- linux-2.6-xen-execshield.patch	18 Jul 2007 17:01:11 -0000	1.3.10.1
+++ linux-2.6-xen-execshield.patch	19 Jul 2007 14:18:17 -0000	1.3.10.2
@@ -366,3 +366,26 @@
  void make_page_readonly(void *va, unsigned int feature);
  void make_page_writable(void *va, unsigned int feature);
  void make_pages_readonly(void *va, unsigned int nr, unsigned int feature);
+Index: patching/include/asm-i386/desc.h
+===================================================================
+--- patching.orig/include/asm-i386/desc.h
++++ patching/include/asm-i386/desc.h
+@@ -206,9 +206,18 @@ static inline void set_user_cs(struct de
+ 	desc->b = (limit & 0xf0000) | 0x00c0fb00;
+ }
+ 
++#ifdef CONFIG_XEN
++
++#define load_user_cs_desc(cpu, mm) \
++        HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32);
++
++#else /* CONFIG_XEN */
++
+ #define load_user_cs_desc(cpu, mm) \
+ 	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
+ 
++#endif /* CONFIG_XEN */
++
+ extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
+ extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
+ extern void arch_flush_exec_range(struct mm_struct *mm);