Merge branch 'master' into tk71

[mv-sheeva.git] / arch / blackfin / kernel / kgdb_test.c

diff --git a/arch/blackfin/kernel/kgdb_test.c b/arch/blackfin/kernel/kgdb_test.c
index 9a4b07594389a6f45f390885f8e62a6365356ded..2a6e9dbb62a5d9eeb28e15f5817136058764bdc4 100644 (file)
--- a/arch/blackfin/kernel/kgdb_test.c
+++ b/arch/blackfin/kernel/kgdb_test.c
@@ -88,12 +88,17 @@ static const struct file_operations kgdb_test_proc_fops = {
        .owner = THIS_MODULE,
        .read  = kgdb_test_proc_read,
        .write = kgdb_test_proc_write,
+       .llseek = noop_llseek,
 };
 
 static int __init kgdbtest_init(void)
 {
        struct proc_dir_entry *entry;
 
+#if L2_LENGTH
+       num2 = 0;
+#endif
+
        entry = proc_create("kgdbtest", 0, NULL, &kgdb_test_proc_fops);
        if (entry == NULL)
                return -ENOMEM;