[Xen-changelog] [linux-2.6.18-xen] merge with linux-2.6.18-xen.hg

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1202407760 25200
# Node ID 482aa2c39049a5bf2d17dfbee348ad4489238913
# Parent  9e3f78203bb5e3870487e421e9f69006418502ec
# Parent  5c61cd349b208a19fd7e9c8d07963166690a3de4
merge with linux-2.6.18-xen.hg
---
 drivers/xen/netback/netback.c              |    2 +-
 include/asm-i386/mach-xen/asm/hypervisor.h |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff -r 9e3f78203bb5 -r 482aa2c39049 drivers/xen/netback/netback.c
--- a/drivers/xen/netback/netback.c     Tue Feb 05 09:27:21 2008 -0700
+++ b/drivers/xen/netback/netback.c     Thu Feb 07 11:09:20 2008 -0700
@@ -607,7 +607,7 @@ static void net_rx_action(unsigned long 
 
        npo.mmu_mcl = npo.mcl_prod;
        if (npo.mcl_prod) {
-               BUG_ON(!xen_feature(XENFEAT_auto_translated_physmap));
+               BUG_ON(xen_feature(XENFEAT_auto_translated_physmap));
                BUG_ON(npo.mmu_prod > ARRAY_SIZE(rx_mmu));
                mcl = npo.mcl + npo.mcl_prod++;
 
diff -r 9e3f78203bb5 -r 482aa2c39049 include/asm-i386/mach-xen/asm/hypervisor.h
--- a/include/asm-i386/mach-xen/asm/hypervisor.h        Tue Feb 05 09:27:21 
2008 -0700
+++ b/include/asm-i386/mach-xen/asm/hypervisor.h        Thu Feb 07 11:09:20 
2008 -0700
@@ -145,7 +145,12 @@ u64 jiffies_to_st(unsigned long jiffies)
 #define MULTI_UVMDOMID_INDEX 4
 #endif
 
+#ifdef CONFIG_XEN
 #define is_running_on_xen() 1
+#else
+extern char *hypercall_stubs;
+#define is_running_on_xen() (!!hypercall_stubs)
+#endif
 
 static inline int
 HYPERVISOR_yield(

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog