From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Katz <katzj@redhat.com>
Subject: RE: compiler errors in latest unstable from 20051027
Date: Wed, 09 Nov 2005 17:08:36 -0500
Message-ID: <1131574116.3533.75.camel@bree.local.net>
References: <A95E2296287EAD4EB592B5DEEFCE0E9D32E895@liverpoolst.ad.cl.cam.ac.uk>
	<Pine.LNX.4.58.0511091549531.1794@gradall.private.brainfood.com>
	<Pine.LNX.4.58.0511091555190.1794@gradall.private.brainfood.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-ZFCoXu/ExUopcm3O7Huc"
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <Pine.LNX.4.58.0511091555190.1794@gradall.private.brainfood.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Adam Heath <doogie@brainfood.com>
Cc: Ian Pratt <m+Ian.Pratt@cl.cam.ac.uk>, "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org


--=-ZFCoXu/ExUopcm3O7Huc
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Wed, 2005-11-09 at 15:59 -0600, Adam Heath wrote:
> > Er, no.  I verified that smp_alt.h doesn't exist in the latest before sending
> > this mail.  As for the other problems, that I didn't verify.
> 
> And I just verified that it doesn't work with latest unstable either.

It looks like a few places aren't making sure that the smp_alternatives
patch is applied... does the attached fix things?

Jeremy

--=-ZFCoXu/ExUopcm3O7Huc
Content-Disposition: attachment; filename=sparse-smp-alt.patch
Content-Type: text/x-patch; name=sparse-smp-alt.patch; charset=utf-8
Content-Transfer-Encoding: 7bit

diff -r abbe3df33774 linux-2.6-xen-sparse/include/asm-xen/asm-i386/spinlock.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/spinlock.h	Tue Nov  8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/spinlock.h	Wed Nov  9 17:08:18 2005
@@ -6,7 +6,10 @@
 #include <asm/page.h>
 #include <linux/config.h>
 #include <linux/compiler.h>
+
+#ifdef CONFIG_SMP_ALTERNATIVES
 #include <asm/smp_alt.h>
+#endif
 
 asmlinkage int printk(const char * fmt, ...)
 	__attribute__ ((format (printf, 1, 2)));
diff -r abbe3df33774 linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Tue Nov  8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Wed Nov  9 17:08:18 2005
@@ -8,7 +8,10 @@
 #include <asm/segment.h>
 #include <asm/cpufeature.h>
 #include <asm/hypervisor.h>
+
+#ifdef CONFIG_SMP_ALTERNATIVES
 #include <asm/smp_alt.h>
+#endif
 
 #ifdef __KERNEL__
 

--=-ZFCoXu/ExUopcm3O7Huc
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

--=-ZFCoXu/ExUopcm3O7Huc--