From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aron Griffis Subject: linux-2.6-xen.hg missing bits from xen-unstable.hg cset 11032 Date: Fri, 6 Oct 2006 09:16:24 -0400 Message-ID: <20061006131624.GB17932@fc.hp.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1757870416==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Christian.Limpach@cl.cam.ac.uk Cc: Chris Wright , xen-devel@lists.xensource.com, Alex Williamson , Juan Quintela List-Id: xen-devel@lists.xenproject.org --===============1757870416== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="opJtzjQTFsWo+cga" Content-Disposition: inline --opJtzjQTFsWo+cga Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Christian, Trying to pull recent xen-unstable bits into linux-2.6-xen shows a conflict in blkback.c. The problem is that some bits were apparently lost when pulling xen-unstable.hg cset 11032. Here is the necessary patch. Signed-off-by: Aron Griffis --- linux-2.6-xen.hg/drivers/xen/blkback/blkback.c 2006-09-11 12:27:11.0000= 00000 -0400 +++ xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c 2006= -09-28 14:56:10.000000000 -0400 @@ -514,17 +514,10 @@ =20 mmap_pages =3D blkif_reqs * BLKIF_MAX_SEGMENTS_PER_REQUEST; =20 -#ifdef CONFIG_XEN_IA64_DOM0_NON_VP - extern unsigned long alloc_empty_foreign_map_page_range( - unsigned long pages); - mmap_vstart =3D (unsigned long) - alloc_empty_foreign_map_page_range(mmap_pages); -#else /* ! ia64 */ page =3D balloon_alloc_empty_page_range(mmap_pages); if (page =3D=3D NULL) return -ENOMEM; mmap_vstart =3D (unsigned long)pfn_to_kaddr(page_to_pfn(page)); -#endif =20 pending_reqs =3D kmalloc(sizeof(pending_reqs[0]) * blkif_reqs, GFP_KERNEL); --opJtzjQTFsWo+cga Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFJlcoJrHF4yAQTrARAlM8AJ9Iqjx7RFFiz1DA+P7riqanjC2+CQCdE5Do LH0341vJwP9REYm96Ehn21w= =1T2H -----END PGP SIGNATURE----- --opJtzjQTFsWo+cga-- --===============1757870416== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============1757870416==--