[Pkg-xen-changes] r1033 - in trunk/xen/debian: . patches

[Bastian Blank]

Author: waldi
Date: Fri Jun 15 15:59:46 2012
New Revision: 1033

Log:
* debian/changelog: Update.
* debian/patches: Fix pointer missmatch on interrupt functions.

Added:
   trunk/xen/debian/patches/xen-x86-interrupt-pointer-missmatch.diff
Modified:
   trunk/xen/debian/changelog
   trunk/xen/debian/patches/series

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Thu Jun 14 18:25:16 2012	(r1032)
+++ trunk/xen/debian/changelog	Fri Jun 15 15:59:46 2012	(r1033)
@@ -1,3 +1,9 @@
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-2) UNRELEASED; urgency=low
+
+  * Fix pointer missmatch on i386.
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 15 Jun 2012 17:58:53 +0200
+
 xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-1) unstable; urgency=low
 
   * New upstream snapshot.

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Thu Jun 14 18:25:16 2012	(r1032)
+++ trunk/xen/debian/patches/series	Fri Jun 15 15:59:46 2012	(r1033)
@@ -4,6 +4,8 @@
 upstream-23939:51288f69523f-rework
 upstream-23940:187d59e32a58
 
+xen-x86-interrupt-pointer-missmatch.diff
+
 version.patch
 
 docs-pdflatex.patch

Added: trunk/xen/debian/patches/xen-x86-interrupt-pointer-missmatch.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen/debian/patches/xen-x86-interrupt-pointer-missmatch.diff	Fri Jun 15 15:59:46 2012	(r1033)
@@ -0,0 +1,42 @@
+Description: Fix pointer type missmatch on interrupt functions
+Author: Bastian Blank <waldi at debian.org>
+
+---
+Origin: debian
+Forwarded: no
+Last-Update: 2012-06-15
+
+--- xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/arch/x86/i8259.c
++++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/arch/x86/i8259.c
+@@ -62,7 +62,7 @@
+     IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \
+     IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f)
+ 
+-    static void (*interrupt[])(void) = {
++    static void (*asmlinkage interrupt[])(void) = {
+         IRQLIST_16(0x0), IRQLIST_16(0x1), IRQLIST_16(0x2), IRQLIST_16(0x3),
+         IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7),
+         IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb),
+--- xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/include/asm-x86/hvm/svm/intr.h
++++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/include/asm-x86/hvm/svm/intr.h
+@@ -21,6 +21,8 @@
+ #ifndef __ASM_X86_HVM_SVM_INTR_H__
+ #define __ASM_X86_HVM_SVM_INTR_H__
+ 
+-void svm_intr_assist(void);
++#include <asm/config.h>
++
++asmlinkage void svm_intr_assist(void);
+ 
+ #endif /* __ASM_X86_HVM_SVM_INTR_H__ */
+--- xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/include/asm-x86/hvm/vmx/vmx.h
++++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/include/asm-x86/hvm/vmx/vmx.h
+@@ -63,7 +63,7 @@
+ 
+ void vmx_asm_vmexit_handler(struct cpu_user_regs);
+ void vmx_asm_do_vmentry(void);
+-void vmx_intr_assist(void);
++asmlinkage void vmx_intr_assist(void);
+ void vmx_do_resume(struct vcpu *);
+ void vmx_vlapic_msr_changed(struct vcpu *v);
+ void vmx_realmode(struct cpu_user_regs *regs);