Remplace patches/patch-cy with fix from the Xen repository via

Christoph Egger, and merge it back in patches/patch-ba (one patch per file).
Bump PKGREVISION

4 files changed, 17 insertions, 24 deletions

diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index 3a862dca8f9..308b681274d 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2007/12/03 21:54:28 bouyer Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/05 22:06:26 bouyer Exp $
 #
 
 VERSION=	3.1.2
 DISTNAME=	xen-${VERSION}-src
 PKGNAME=	xenkernel3-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index 77ea4142300..496be509718 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.6 2007/12/03 21:54:29 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2007/12/05 22:06:26 bouyer Exp $
 
 SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e
 RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad
 Size (xen-3.1.2-src.tgz) = 6975860 bytes
 SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
-SHA1 (patch-ba) = f9a576b74a7039167aee57d9583ac99e9cbf70a1
+SHA1 (patch-ba) = fbc32d449d5f3410e478b92d6348f550609d1180
 SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
 SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
 SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
 SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
-SHA1 (patch-cy) = 6fcaa3284442b19f6580173ac8753d9216fa10cf
diff --git a/sysutils/xenkernel3/patches/patch-ba b/sysutils/xenkernel3/patches/patch-ba
index 368d9ec5d19..fa98c478f64 100644
--- a/sysutils/xenkernel3/patches/patch-ba
+++ b/sysutils/xenkernel3/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2007/11/26 19:35:25 bouyer Exp $
+$NetBSD: patch-ba,v 1.3 2007/12/05 22:06:27 bouyer Exp $
 
---- xen/arch/x86/domain_build.c.orig	2007-05-18 16:45:21.000000000 +0200
-+++ xen/arch/x86/domain_build.c	2007-11-26 15:49:00.000000000 +0100
-@@ -312,6 +312,9 @@
+--- xen/arch/x86/domain_build.c.orig	2007-11-15 00:35:27.000000000 +0100
++++ xen/arch/x86/domain_build.c	2007-12-05 22:55:53.000000000 +0100
+@@ -316,6 +316,9 @@
             parms.pae       ? ", PAE"  : "",
             elf_msb(&elf)   ? "msb"    : "lsb",
             elf.pstart, elf.pend);
@@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.2 2007/11/26 19:35:25 bouyer Exp $
  
      if ( !compatible )
      {
-@@ -345,6 +348,8 @@
+@@ -349,6 +352,8 @@
      if ( parms.pae == PAEKERN_extended_cr3 )
              set_bit(VMASST_TYPE_pae_extended_cr3, &d->vm_assist);
  
@@ -21,3 +21,11 @@ $NetBSD: patch-ba,v 1.2 2007/11/26 19:35:25 bouyer Exp $
      if ( UNSET_ADDR != parms.virt_hv_start_low && elf_32bit(&elf) )
      {
  #if CONFIG_PAGING_LEVELS < 4
+@@ -642,6 +647,7 @@
+         l4start = l4tab = page_to_virt(page);
+     }
+     copy_page(l4tab, idle_pg_table);
++    l4tab[0] = l4e_empty(); /* zap trampoline mapping */
+     l4tab[l4_table_offset(LINEAR_PT_VIRT_START)] =
+         l4e_from_paddr(__pa(l4start), __PAGE_HYPERVISOR);
+     l4tab[l4_table_offset(PERDOMAIN_VIRT_START)] =
diff --git a/sysutils/xenkernel3/patches/patch-cy b/sysutils/xenkernel3/patches/patch-cy
deleted file mode 100644
index 5f43b4dc597..00000000000
--- a/sysutils/xenkernel3/patches/patch-cy
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cy,v 1.1 2007/12/03 21:54:30 bouyer Exp $
-
---- xen/arch/x86/domain_build.c.orig	2007-12-03 21:59:10.000000000 +0100
-+++ xen/arch/x86/domain_build.c	2007-12-03 22:01:57.000000000 +0100
-@@ -768,6 +768,10 @@
-             l1start = l1tab = l2e_to_l1e(*l2tab);
-         }
-     }
-+    /* make sure remaining entries are clear */
-+    l4tab = l4start;
-+    for ( count = 0; count < ROOT_PAGETABLE_FIRST_XEN_SLOT; count++)
-+	l4tab[count].l4 = 0;
- 
- #endif /* __x86_64__ */
-