ia64/xen-unstable

changeset 14753:83ce6f4da212

merge
author Ian Campbell <ian.campbell@xensource.com>
date Thu Apr 05 15:47:03 2007 +0100 (2007-04-05)
parents e2fdfb0802bd 4d29476fc460
children 7cce8838abe0 3b4de5f415c9
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Thu Apr 05 15:41:04 2007 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Thu Apr 05 15:47:03 2007 +0100
     1.3 @@ -59,6 +59,10 @@
     1.4  #include <xen/xenbus.h>
     1.5  #include "common.h"
     1.6  
     1.7 +#ifdef HAVE_XEN_PLATFORM_COMPAT_H
     1.8 +#include <xen/platform-compat.h>
     1.9 +#endif
    1.10 +
    1.11  #ifdef CONFIG_PROC_FS
    1.12  static struct proc_dir_entry *balloon_pde;
    1.13  #endif
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c	Thu Apr 05 15:41:04 2007 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c	Thu Apr 05 15:47:03 2007 +0100
     2.3 @@ -31,9 +31,14 @@
     2.4  #include <linux/capability.h>
     2.5  #include <linux/errno.h>
     2.6  #include <linux/stat.h>
     2.7 +#include <linux/string.h>
     2.8  #include <linux/sysdev.h>
     2.9  #include "common.h"
    2.10  
    2.11 +#ifdef HAVE_XEN_PLATFORM_COMPAT_H
    2.12 +#include <xen/platform-compat.h>
    2.13 +#endif
    2.14 +
    2.15  #define BALLOON_CLASS_NAME "memory"
    2.16  
    2.17  #define BALLOON_SHOW(name, format, args...)			\
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c	Thu Apr 05 15:41:04 2007 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c	Thu Apr 05 15:47:03 2007 +0100
     3.3 @@ -24,6 +24,7 @@
     3.4  #include <linux/module.h>
     3.5  #include <linux/vmalloc.h>
     3.6  #include <linux/mm.h>
     3.7 +#include <linux/mutex.h>
     3.8  #include <asm/hypervisor.h>
     3.9  #include <xen/evtchn.h>
    3.10  #include <xen/interface/io/fbif.h>
     4.1 --- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h	Thu Apr 05 15:41:04 2007 +0100
     4.2 +++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h	Thu Apr 05 15:47:03 2007 +0100
     4.3 @@ -40,7 +40,7 @@
     4.4  /* Some kernels have this typedef backported so we cannot reliably
     4.5   * detect based on version number, hence we forcibly #define it.
     4.6   */
     4.7 -#if defined(__LINUX_TYPES_H) || defined(__LINUX_GFP_H)
     4.8 +#if defined(__LINUX_TYPES_H) || defined(__LINUX_GFP_H) || defined(_LINUX_KERNEL_H)
     4.9  #define gfp_t unsigned
    4.10  #endif
    4.11  
    4.12 @@ -51,6 +51,14 @@
    4.13  #define atomic_notifier_call_chain(chain,val,v) notifier_call_chain(chain,val,v)
    4.14  #endif
    4.15  
    4.16 +#if defined(_LINUX_MM_H) && defined set_page_count
    4.17 +#define init_page_count(page) set_page_count(page, 1)
    4.18 +#endif
    4.19 +
    4.20 +#if defined(__LINUX_GFP_H) && !defined __GFP_NOMEMALLOC
    4.21 +#define __GFP_NOMEMALLOC 0
    4.22 +#endif
    4.23 +
    4.24  #if defined(_LINUX_FS_H) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
    4.25  #define nonseekable_open(inode, filp) /* Nothing to do */
    4.26  #endif
    4.27 @@ -75,6 +83,10 @@ void *kzalloc(size_t size, int flags);
    4.28  #define end_that_request_last(req, uptodate) end_that_request_last(req)
    4.29  #endif
    4.30  
    4.31 +#if defined(_LINUX_CAPABILITY_H) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
    4.32 +#define capable(cap) (1)
    4.33 +#endif
    4.34 +
    4.35  #if defined(_LINUX_KERNEL_H) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
    4.36  extern char *kasprintf(gfp_t gfp, const char *fmt, ...)
    4.37         __attribute__ ((format (printf, 2, 3)));