[PATCH] Fix external module build for 2.6.22

[PATCH] Fix external module build for 2.6.22

[Jan Kiszka]

2.6.22 came with anon_inode_getfd, but it didn't export it. Since 2.6.23
it is usable for modules, too.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/kernel/anon_inodes.c b/kernel/anon_inodes.c
index 7155b4d..8512118 100644
--- a/kernel/anon_inodes.c
+++ b/kernel/anon_inodes.c
@@ -21,7 +21,7 @@
 
 #include <asm/uaccess.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
 
 static struct vfsmount *anon_inode_mnt __read_mostly;
 static struct inode *anon_inode_inode;

Re: [PATCH] Fix external module build for 2.6.22

[Avi Kivity]

Jan Kiszka wrote:
> 2.6.22 came with anon_inode_getfd, but it didn't export it. Since 2.6.23
> it is usable for modules, too.
>
>   

Applied, thanks.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

[PATCH] Fix external module build for 2.6.22

[Jan Kiszka]

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h
index 2e87c57..6072fde 100644
--- a/kernel/external-module-compat-comm.h
+++ b/kernel/external-module-compat-comm.h
@@ -517,6 +517,11 @@ static inline int cancel_work_sync(struct work_struct *work)
 	return 0;
 }
 
+/* ... and it returned void before 2.6.23 */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+
+#define cancel_work_sync(work) ({ cancel_work_sync(work); 0; })
+
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)