-Conditional inclusion of asm.h for kernel > 3.4 -The owner field of proc_dir_entry has been removed from kernel ver 2.6.30 -SPIN_LOCK_UNLOCKED is depricated. DEFINE_SPINLOCK is available all the way back to 2.6.12, so no need of conditional declaration.
Signed-off-by: Sweekar Pinto <[email protected]> --- testcases/kdump/lib/crasher/crasher.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/testcases/kdump/lib/crasher/crasher.c b/testcases/kdump/lib/crasher/crasher.c index bc192dc..fe72986 100644 --- a/testcases/kdump/lib/crasher/crasher.c +++ b/testcases/kdump/lib/crasher/crasher.c @@ -25,7 +25,10 @@ #include <linux/proc_fs.h> #include <linux/spinlock.h> #include <asm/uaccess.h> -#include <asm/system.h> +#include <linux/version.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) +# include <asm/system.h> +#endif MODULE_LICENSE("GPL"); @@ -46,7 +49,7 @@ static int crasher_write(struct file *file, const char *buffer, unsigned long count, void *data) { char value, *a; - spinlock_t mylock = SPIN_LOCK_UNLOCKED; + DEFINE_SPINLOCK(mylock); /* grab the first byte the user gave us, ignore the rest */ if (copy_from_user(&value, buffer, 1)) @@ -91,10 +94,11 @@ int crasher_init(void) if ((crasher_proc = create_proc_entry(CRASH, 0, NULL)) == NULL) { return -ENOMEM; } - +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + crasher_proc->owner = THIS_MODULE +#endif crasher_proc->read_proc = crasher_read; crasher_proc->write_proc = crasher_write; - crasher_proc->owner = THIS_MODULE; return 0; } -- 1.7.1 ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
