diff -u virtualbox-ose-3.1.6-dfsg/debian/changelog virtualbox-ose-3.1.6-dfsg/debian/changelog
--- virtualbox-ose-3.1.6-dfsg/debian/changelog
+++ virtualbox-ose-3.1.6-dfsg/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox-ose (3.1.6-dfsg-2ubuntu2) lucid; urgency=low
+
+  * Disable Launchpad integration for the stable release.
+  * Add u03-fix-cpu-lockup.dpatch, cherry-picked from upstream to
+    fix a bug causing the CPU to lockup on boot. (LP: #562187)
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Wed, 14 Apr 2010 16:53:41 +0200
+
 virtualbox-ose (3.1.6-dfsg-2ubuntu1) lucid; urgency=low
 
   * Merge from Debian unstable (LP: #549588), remaining changes:
diff -u virtualbox-ose-3.1.6-dfsg/debian/patches/00list virtualbox-ose-3.1.6-dfsg/debian/patches/00list
--- virtualbox-ose-3.1.6-dfsg/debian/patches/00list
+++ virtualbox-ose-3.1.6-dfsg/debian/patches/00list
@@ -13 +13,2 @@
-u02-lp-integration.dpatch
+#u02-lp-integration.dpatch
+u03-fix-cpu-lockup.dpatch
only in patch2:
unchanged:
--- virtualbox-ose-3.1.6-dfsg.orig/debian/patches/u03-fix-cpu-lockup.dpatch
+++ virtualbox-ose-3.1.6-dfsg/debian/patches/u03-fix-cpu-lockup.dpatch
@@ -0,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+# Description: Check for write conflicts with our hypervisor mapping early on.
+#  If the guest happens to access a non-present page, where our hypervisor is currently mapped,
+#  then we'll create a #PF storm in the guest.
+# Origin: upstream, http://www.virtualbox.org/changeset/28090 and http://www.virtualbox.org/changeset/28094
+# Bug: http://www.virtualbox.org/ticket/6425
+# Bug-Ubuntu: https://bugs.launchpad.net/bugs/562187
+
+@DPATCH@
+
+--- trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 27976)
++++ trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 28090)
+@@ -147,4 +147,45 @@
+     const unsigned  iPDSrc = 0;
+ #  endif /* !PGM_WITH_PAGING */
++
++# if !defined(PGM_WITHOUT_MAPPINGS) && ((PGM_GST_TYPE == PGM_TYPE_32BIT) || (PGM_GST_TYPE == PGM_TYPE_PAE))
++    /*
++     * Check for write conflicts with our hypervisor mapping early on. If the guest happens to access a non-present page,
++     * where our hypervisor is currently mapped, then we'll create a #PF storm in the guest.
++     */
++    if ((uErr & (X86_TRAP_PF_P | X86_TRAP_PF_RW)) == (X86_TRAP_PF_P | X86_TRAP_PF_RW))
++    {
++        pgmLock(pVM);
++#  if PGM_SHW_TYPE == PGM_TYPE_32BIT
++        const unsigned  iPDDst = pvFault >> SHW_PD_SHIFT;
++        PX86PD          pPDDst = pgmShwGet32BitPDPtr(&pVCpu->pgm.s);
++#  else /* PGM_SHW_TYPE == PGM_TYPE_PAE */
++        const unsigned  iPDDst = (pvFault >> SHW_PD_SHIFT) & SHW_PD_MASK;   /* pPDDst index, not used with the pool. */
++
++        PX86PDPAE       pPDDst;
++#   if PGM_GST_TYPE != PGM_TYPE_PAE
++        X86PDPE         PdpeSrc;
++
++        /* Fake PDPT entry; access control handled on the page table level, so allow everything. */
++        PdpeSrc.u  = X86_PDPE_P;   /* rw/us are reserved for PAE pdpte's; accessed bit causes invalid VT-x guest state errors */
++#   endif
++        int rc = pgmShwSyncPaePDPtr(pVCpu, pvFault, &PdpeSrc, &pPDDst);
++        if (rc != VINF_SUCCESS)
++        {
++            pgmUnlock(pVM);
++            AssertRC(rc);
++            return rc;
++        }
++        Assert(pPDDst);
++#  endif
++        if (pPDDst->a[iPDDst].u & PGM_PDFLAGS_MAPPING)
++        {
++            pgmUnlock(pVM);
++            /* Force a CR3 sync to check for conflicts and emulate the instruction. */
++            VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3);
++            return VINF_EM_RAW_EMULATE_INSTR;
++        }
++        pgmUnlock(pVM);
++    }
++# endif
+ 
+     /* First check for a genuine guest page fault. */
+--- trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 28090)
++++ trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 28094)
+@@ -169,5 +169,5 @@
+         PdpeSrc.u  = X86_PDPE_P;   /* rw/us are reserved for PAE pdpte's; accessed bit causes invalid VT-x guest state errors */
+ #   endif
+-        int rc = pgmShwSyncPaePDPtr(pVCpu, pvFault, &PdpeSrc, &pPDDst);
++        rc = pgmShwSyncPaePDPtr(pVCpu, pvFault, &PdpeSrc, &pPDDst);
+         if (rc != VINF_SUCCESS)
+         {