Subversion Repositories livecd

Rev

Rev 36 | Blame | Compare with Previous | Last modification | View Log | Download | RSS feed

diff -ur unionfs-1.1.5.ori/main.c unionfs-1.1.5/main.c
--- unionfs-1.1.5.ori/main.c    2006-06-12 04:03:36.000000000 +0200
+++ unionfs-1.1.5/main.c        2006-08-31 11:14:28.000000000 +0200
@@ -737,7 +737,7 @@
 
 /* Compat..it is simpler to have it here, than to duplicate the code in
    unionfs_kzalloc and KZALLOC non-debug macro */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
 void *kzalloc(size_t size, gfp_t flags)
 {
        void *ret = kmalloc(size, flags);
@@ -745,7 +745,7 @@
                memset(ret, 0, size);
        return ret;
 }
-#endif                         /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) */
+#endif                         /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) */
 
 static struct file_system_type unionfs_fs_type = {
        .owner = THIS_MODULE,
diff -ur unionfs-1.1.5.ori/unionfs.h unionfs-1.1.5/unionfs.h
--- unionfs-1.1.5.ori/unionfs.h 2006-06-12 04:03:36.000000000 +0200
+++ unionfs-1.1.5/unionfs.h     2006-08-30 08:43:24.000000000 +0200
@@ -216,7 +216,7 @@
 };
 
 /* Compat stuff.. */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
 
 # ifdef __CHECKER__
 #  define __bitwise__ __attribute__((bitwise))
@@ -226,7 +226,7 @@
 
 typedef unsigned __bitwise__ gfp_t;
 void *kzalloc(size_t size, gfp_t flags);
-#endif                         /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) */
+#endif                         /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) */
 
 #ifdef FIST_MALLOC_DEBUG