55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
# HG changeset patch
|
|
# User Ian Campbell <ian.campbell@xensource.com>
|
|
# Date Wed Oct 25 13:58:30 2006 +0100
|
|
# Node ID 9f0b88aaf17076bcdc42dfef0870ba9f39e72f23
|
|
# parent: db0d3f22e149d832e722173fa0e037e574db5f37
|
|
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>
|
|
|
|
--- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h Wed Oct 25 13:58:30 2006 +0100
|
|
+++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h Wed Oct 25 13:58:30 2006 +0100
|
|
@@ -41,4 +41,8 @@ signed long schedule_timeout_interruptib
|
|
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
|
|
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c Wed Oct 25 13:58:30 2006 +0100
|
|
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c Wed Oct 25 13:58:30 2006 +0100
|
|
@@ -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_interruptib
|
|
}
|
|
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
|
|
|