From 258303e08ec31bccd6f0f66a0421e6aa0f1b8815 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 6 Jun 2010 11:12:25 +0200 Subject: [PATCH] compat: move kparam_{block,unblock}_sysfs_write kparam_block_sysfs_write and kparam_unblock_sysfs_write are not in kernel 2.6.35, move them to backport from kernel 2.6.36. Signed-off-by: Hauke Mehrtens --- include/linux/compat-2.6.35.h | 3 --- include/linux/compat-2.6.36.h | 13 +++++++++++++ include/linux/compat-2.6.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 include/linux/compat-2.6.36.h diff --git a/include/linux/compat-2.6.35.h b/include/linux/compat-2.6.35.h index b38d6deff4a1..886815d5f69e 100644 --- a/include/linux/compat-2.6.35.h +++ b/include/linux/compat-2.6.35.h @@ -23,9 +23,6 @@ static inline wait_queue_head_t *sk_sleep(struct sock *sk) return sk->sk_sleep; } -#define kparam_block_sysfs_write(a) -#define kparam_unblock_sysfs_write(a) - #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) */ #endif /* LINUX_26_35_COMPAT_H */ diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h new file mode 100644 index 000000000000..03071080874c --- /dev/null +++ b/include/linux/compat-2.6.36.h @@ -0,0 +1,13 @@ +#ifndef LINUX_26_36_COMPAT_H +#define LINUX_26_36_COMPAT_H + +#include + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) + +#define kparam_block_sysfs_write(a) +#define kparam_unblock_sysfs_write(a) + +#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) */ + +#endif /* LINUX_26_36_COMPAT_H */ diff --git a/include/linux/compat-2.6.h b/include/linux/compat-2.6.h index 6171cd9a2680..ef51195f7b9d 100644 --- a/include/linux/compat-2.6.h +++ b/include/linux/compat-2.6.h @@ -28,5 +28,6 @@ #include #include #include +#include #endif /* LINUX_26_COMPAT_H */ -- 2.30.2