[Xen-changelog] [xen-unstable] merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1175784423 -3600
# Node ID 83ce6f4da2120231698a9db80b499ed3f6240a33
# Parent  e2fdfb0802bd858844c930a537dc78ec8d6f3f75
# Parent  4d29476fc4608a37c97f5cc9eef181c5715674c4
merge
---
 linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c                |    4 ++
 linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c                  |    5 +++
 linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c                  |    1 
 unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h |   14 
+++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff -r e2fdfb0802bd -r 83ce6f4da212 
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Thu Apr 05 
15:41:04 2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Thu Apr 05 
15:47:03 2007 +0100
@@ -59,6 +59,10 @@
 #include <xen/xenbus.h>
 #include "common.h"
 
+#ifdef HAVE_XEN_PLATFORM_COMPAT_H
+#include <xen/platform-compat.h>
+#endif
+
 #ifdef CONFIG_PROC_FS
 static struct proc_dir_entry *balloon_pde;
 #endif
diff -r e2fdfb0802bd -r 83ce6f4da212 
linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c  Thu Apr 05 15:41:04 
2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c  Thu Apr 05 15:47:03 
2007 +0100
@@ -31,8 +31,13 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #include <linux/sysdev.h>
 #include "common.h"
+
+#ifdef HAVE_XEN_PLATFORM_COMPAT_H
+#include <xen/platform-compat.h>
+#endif
 
 #define BALLOON_CLASS_NAME "memory"
 
diff -r e2fdfb0802bd -r 83ce6f4da212 
linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c
--- a/linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c  Thu Apr 05 15:41:04 
2007 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c  Thu Apr 05 15:47:03 
2007 +0100
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
+#include <linux/mutex.h>
 #include <asm/hypervisor.h>
 #include <xen/evtchn.h>
 #include <xen/interface/io/fbif.h>
diff -r e2fdfb0802bd -r 83ce6f4da212 
unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
--- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h Thu Apr 
05 15:41:04 2007 +0100
+++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h Thu Apr 
05 15:47:03 2007 +0100
@@ -40,7 +40,7 @@
 /* Some kernels have this typedef backported so we cannot reliably
  * detect based on version number, hence we forcibly #define it.
  */
-#if defined(__LINUX_TYPES_H) || defined(__LINUX_GFP_H)
+#if defined(__LINUX_TYPES_H) || defined(__LINUX_GFP_H) || 
defined(_LINUX_KERNEL_H)
 #define gfp_t unsigned
 #endif
 
@@ -49,6 +49,14 @@
 #define atomic_notifier_chain_register(chain,nb) 
notifier_chain_register(chain,nb)
 #define atomic_notifier_chain_unregister(chain,nb) 
notifier_chain_unregister(chain,nb)
 #define atomic_notifier_call_chain(chain,val,v) 
notifier_call_chain(chain,val,v)
+#endif
+
+#if defined(_LINUX_MM_H) && defined set_page_count
+#define init_page_count(page) set_page_count(page, 1)
+#endif
+
+#if defined(__LINUX_GFP_H) && !defined __GFP_NOMEMALLOC
+#define __GFP_NOMEMALLOC 0
 #endif
 
 #if defined(_LINUX_FS_H) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
@@ -75,6 +83,10 @@ void *kzalloc(size_t size, int flags);
 #define end_that_request_last(req, uptodate) end_that_request_last(req)
 #endif
 
+#if defined(_LINUX_CAPABILITY_H) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+#define capable(cap) (1)
+#endif
+
 #if defined(_LINUX_KERNEL_H) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
 extern char *kasprintf(gfp_t gfp, const char *fmt, ...)
        __attribute__ ((format (printf, 2, 3)));

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