| 36 |
beyerle@PS |
1 |
diff -ur unionfs-1.1.5.ori/main.c unionfs-1.1.5/main.c
|
|
|
2 |
--- unionfs-1.1.5.ori/main.c 2006-06-12 04:03:36.000000000 +0200
|
|
|
3 |
+++ unionfs-1.1.5/main.c 2006-08-31 11:14:28.000000000 +0200
|
|
|
4 |
@@ -737,7 +737,7 @@
|
|
|
5 |
|
|
|
6 |
/* Compat..it is simpler to have it here, than to duplicate the code in
|
|
|
7 |
unionfs_kzalloc and KZALLOC non-debug macro */
|
|
|
8 |
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
|
|
|
9 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
|
|
|
10 |
void *kzalloc(size_t size, gfp_t flags)
|
|
|
11 |
{
|
|
|
12 |
void *ret = kmalloc(size, flags);
|
|
|
13 |
@@ -745,7 +745,7 @@
|
|
|
14 |
memset(ret, 0, size);
|
|
|
15 |
return ret;
|
|
|
16 |
}
|
|
|
17 |
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) */
|
|
|
18 |
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) */
|
|
|
19 |
|
|
|
20 |
static struct file_system_type unionfs_fs_type = {
|
|
|
21 |
.owner = THIS_MODULE,
|
|
|
22 |
diff -ur unionfs-1.1.5.ori/unionfs.h unionfs-1.1.5/unionfs.h
|
|
|
23 |
--- unionfs-1.1.5.ori/unionfs.h 2006-06-12 04:03:36.000000000 +0200
|
|
|
24 |
+++ unionfs-1.1.5/unionfs.h 2006-08-30 08:43:24.000000000 +0200
|
|
|
25 |
@@ -216,7 +216,7 @@
|
|
|
26 |
};
|
|
|
27 |
|
|
|
28 |
/* Compat stuff.. */
|
|
|
29 |
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
|
|
|
30 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
|
|
|
31 |
|
|
|
32 |
# ifdef __CHECKER__
|
|
|
33 |
# define __bitwise__ __attribute__((bitwise))
|
|
|
34 |
@@ -226,7 +226,7 @@
|
|
|
35 |
|
|
|
36 |
typedef unsigned __bitwise__ gfp_t;
|
|
|
37 |
void *kzalloc(size_t size, gfp_t flags);
|
|
|
38 |
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) */
|
|
|
39 |
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) */
|
|
|
40 |
|
|
|
41 |
#ifdef FIST_MALLOC_DEBUG
|
|
|
42 |
|