[PATCH] kprobes: fix build breakage

The following patch (against 2.6.15-rc5-mm3) fixes a kprobes build break
due to changes introduced in the kprobe locking in 2.6.15-rc5-mm3.  In
addition, the patch reverts back the open-coding of kprobe_mutex.

Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Acked-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 93444e32fccd3ad93b049cc04163ac2cc58926d4..27b0c40601fb5d6db8a13b9915ad2d626152173f 100644 (file)
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -80,11 +80,11 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
                           (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void __kprobes arch_remove_kprobe(struct kprobe *p, struct semaphore *s)
+void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
-       down(s);
+       down(&kprobe_mutex);
        free_insn_slot(p->ainsn.insn);
-       up(s);
+       up(&kprobe_mutex);
 }
 
 static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)

diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c
index 61a6a9369cbd8a37286cd39e204479b13818babb..b7dc1f816d13e616dacced97857994f42000ee47 100644 (file)
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
@@ -220,11 +220,11 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
                           (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void __kprobes arch_remove_kprobe(struct kprobe *p, struct semaphore *s)
+void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
-       down(s);
+       down(&kprobe_mutex);
        free_insn_slot(p->ainsn.insn);
-       up(s);
+       up(&kprobe_mutex);
 }
 
 static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb)

diff --git a/include/asm-i386/kprobes.h b/include/asm-i386/kprobes.h
index dc559267ce3e4e506a67898f8b95ae9058daa0a8..27cac050a60e56cb71c750a196a80c8894e8abb1 100644 (file)
--- a/include/asm-i386/kprobes.h
+++ b/include/asm-i386/kprobes.h
@@ -40,7 +40,7 @@ typedef u8 kprobe_opcode_t;
 
 #define JPROBE_ENTRY(pentry)   (kprobe_opcode_t *)pentry
 #define ARCH_SUPPORTS_KRETPROBES
-#define arch_remove_kprobe(p, s)       do { } while(0)
+#define arch_remove_kprobe(p)  do {} while (0)
 
 void kretprobe_trampoline(void);
 

diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h
index 698508f4a0cfac5c992b65f19562c17fc2b6b34e..a74b68104559a556e335e80b7262c46594086a89 100644 (file)
--- a/include/asm-ia64/kprobes.h
+++ b/include/asm-ia64/kprobes.h
@@ -89,7 +89,7 @@ struct kprobe_ctlblk {
 #define IP_RELATIVE_PREDICT_OPCODE     (7)
 #define LONG_BRANCH_OPCODE             (0xC)
 #define LONG_CALL_OPCODE               (0xD)
-#define arch_remove_kprobe(p, s)       do { } while(0)
+#define arch_remove_kprobe(p)          do {} while (0)
 
 typedef struct kprobe_opcode {
        bundle_t bundle;

diff --git a/include/asm-powerpc/kprobes.h b/include/asm-powerpc/kprobes.h
index 89dee13c2a4c49dcab49ae0dcda349d9aacb4a59..f466bc804f41ee21a7372cd1cc0328e872629508 100644 (file)
--- a/include/asm-powerpc/kprobes.h
+++ b/include/asm-powerpc/kprobes.h
@@ -33,6 +33,7 @@
 #define  __ARCH_WANT_KPROBES_INSN_SLOT
 
 struct pt_regs;
+struct kprobe;
 
 typedef unsigned int kprobe_opcode_t;
 #define BREAKPOINT_INSTRUCTION 0x7fe00008      /* trap */
@@ -50,7 +51,7 @@ typedef unsigned int kprobe_opcode_t;
 
 #define ARCH_SUPPORTS_KRETPROBES
 void kretprobe_trampoline(void);
-extern void arch_remove_kprobe(struct kprobe *p, struct semaphore *s);
+extern void arch_remove_kprobe(struct kprobe *p);
 
 /* Architecture specific copy of original instruction */
 struct arch_specific_insn {

diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h
index 27fbdcba724be964c4195ab2dc03a3fb7fb321d5..e4efe652b54b91322a81025a42e11f44ddcc2bbe 100644 (file)
--- a/include/asm-sparc64/kprobes.h
+++ b/include/asm-sparc64/kprobes.h
@@ -12,7 +12,7 @@ typedef u32 kprobe_opcode_t;
 #define MAX_INSN_SIZE 2
 
 #define JPROBE_ENTRY(pentry)   (kprobe_opcode_t *)pentry
-#define arch_remove_kprobe(p, s)       do { } while(0)
+#define arch_remove_kprobe(p)  do {} while (0)
 
 /* Architecture specific copy of original instruction*/
 struct arch_specific_insn {

diff --git a/include/asm-x86_64/kprobes.h b/include/asm-x86_64/kprobes.h
index 3a19ad179220e339aab598da96cdc4276961bd49..98a1e95ddb981c22e84e2d2e82ea754c242f43f7 100644 (file)
--- a/include/asm-x86_64/kprobes.h
+++ b/include/asm-x86_64/kprobes.h
@@ -30,6 +30,7 @@
 #define  __ARCH_WANT_KPROBES_INSN_SLOT
 
 struct pt_regs;
+struct kprobe;
 
 typedef u8 kprobe_opcode_t;
 #define BREAKPOINT_INSTRUCTION 0xcc
@@ -44,6 +45,7 @@ typedef u8 kprobe_opcode_t;
 #define ARCH_SUPPORTS_KRETPROBES
 
 void kretprobe_trampoline(void);
+extern void arch_remove_kprobe(struct kprobe *p);
 
 /* Architecture specific copy of original instruction*/
 struct arch_specific_insn {
@@ -78,7 +80,6 @@ static inline void restore_interrupts(struct pt_regs *regs)
                local_irq_enable();
 }
 
-extern void arch_remove_kprobe(struct kprobe *p, struct semaphore *s);
 extern int post_kprobe_handler(struct pt_regs *regs);
 extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
 extern int kprobe_handler(struct pt_regs *regs);

diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 59bf240cdb9d8b512e8bd01dcef18fe1c76fb128..10005bc92a316000321e89ea87a76d3e7599b1ea 100644 (file)
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -149,6 +149,7 @@ struct kretprobe_instance {
 };
 
 extern spinlock_t kretprobe_lock;
+extern struct semaphore kprobe_mutex;
 extern int arch_prepare_kprobe(struct kprobe *p);
 extern void arch_arm_kprobe(struct kprobe *p);
 extern void arch_disarm_kprobe(struct kprobe *p);

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 19c42cbf91a04649d1c6dc8023505e2a7566fce1..f24cbab558f13e63d34ba6de7ba1bad728dbac50 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -48,7 +48,7 @@
 static struct hlist_head kprobe_table[KPROBE_TABLE_SIZE];
 static struct hlist_head kretprobe_inst_table[KPROBE_TABLE_SIZE];
 
-static DECLARE_MUTEX(kprobe_mutex);    /* Protects kprobe_table */
+DECLARE_MUTEX(kprobe_mutex);           /* Protects kprobe_table */
 DEFINE_SPINLOCK(kretprobe_lock);       /* Protects kretprobe_inst_table */
 static DEFINE_PER_CPU(struct kprobe *, kprobe_instance) = NULL;
 
@@ -532,7 +532,7 @@ valid_p:
                        list_del_rcu(&p->list);
                        kfree(old_p);
                }
-               arch_remove_kprobe(p, &kprobe_mutex);
+               arch_remove_kprobe(p);
        }
 }