diff options
author | Ian Campbell <ian.campbell@xensource.com> | 2006-10-25 13:58:30 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@xensource.com> | 2006-10-25 13:58:30 +0100 |
commit | 4a154f7453f2de0094505d13757c080345a5868e (patch) | |
tree | 2be8955597a30482b24e505e47d72d02253c1e05 /unmodified_drivers | |
parent | f81a7efad89b56fa1782995b1527ba831e1a2057 (diff) | |
download | xen-4a154f7453f2de0094505d13757c080345a5868e.tar.gz xen-4a154f7453f2de0094505d13757c080345a5868e.tar.bz2 xen-4a154f7453f2de0094505d13757c080345a5868e.zip |
PV-on-HVM: Include compatibility kzalloc implementation for kernels
before 2.6.14.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com>
Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
Diffstat (limited to 'unmodified_drivers')
-rw-r--r-- | unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h | 4 | ||||
-rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-compat.c | 17 |
2 files changed, 21 insertions, 0 deletions
diff --git a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h index 6c08dad47d..219382c3c1 100644 --- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h +++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h @@ -41,4 +41,8 @@ unsigned long wait_for_completion_timeout(struct completion *x, unsigned long ti signed long schedule_timeout_interruptible(signed long timeout); #endif +#if defined(_LINUX_SLAB_H) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) +void *kzalloc(size_t size, int flags); +#endif + #endif diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c index f7c8db7fcd..f3cef11620 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c @@ -4,6 +4,7 @@ #include <linux/mm.h> #include <linux/module.h> #include <linux/sched.h> +#include <linux/slab.h> #include <xen/platform-compat.h> @@ -97,3 +98,19 @@ signed long schedule_timeout_interruptible(signed long timeout) } EXPORT_SYMBOL(schedule_timeout_interruptible); #endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) +/** + * kzalloc - allocate memory. The memory is set to zero. + * @size: how many bytes of memory are required. + * @flags: the type of memory to allocate. + */ +void *kzalloc(size_t size, int flags) +{ + void *ret = kmalloc(size, flags); + if (ret) + memset(ret, 0, size); + return ret; +} +EXPORT_SYMBOL(kzalloc); +#endif |