[PATCH] kprobes: cleanup include/asm/kprobes.h
authorAnil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Tue, 10 Jan 2006 04:52:42 +0000 (20:52 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:01:40 +0000 (08:01 -0800)
The arch specific kprobes.h files never gets included when CONFIG_KPROBES is
turned off.  Hence check for CONFIG_KPROBES is not appropriate here in this
arch specific kprobes.h files.

Also the below defined function kprobes_exception_notify() is not needed when
CONFIG_KPROBES is off.

Compile tested for both CONFIG_KPROBES=y and N.

Signed-off-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>
include/asm-i386/kprobes.h
include/asm-ia64/kprobes.h
include/asm-powerpc/kprobes.h
include/asm-sparc64/kprobes.h

index ca916a892877edaddd26d048f74a33352dc6cd8f..f9e150fa1d44e9adfa29919f006a03b5af6cb225 100644 (file)
@@ -76,14 +76,6 @@ static inline void restore_interrupts(struct pt_regs *regs)
                local_irq_enable();
 }
 
-#ifdef CONFIG_KPROBES
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                                    unsigned long val, void *data);
-#else                          /* !CONFIG_KPROBES */
-static inline int kprobe_exceptions_notify(struct notifier_block *self,
-                                          unsigned long val, void *data)
-{
-       return 0;
-}
-#endif
 #endif                         /* _ASM_KPROBES_H */
index 592abb000e29bc9260257a5f9fb806eae367a21d..5b26462674a7096c33ccf3f9133d2acd4e03062e 100644 (file)
@@ -115,7 +115,6 @@ static inline void arch_copy_kprobe(struct kprobe *p)
 {
 }
 
-#ifdef CONFIG_KPROBES
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                                    unsigned long val, void *data);
 
@@ -124,11 +123,4 @@ static inline void jprobe_return(void)
 {
 }
 
-#else                          /* !CONFIG_KPROBES */
-static inline int kprobe_exceptions_notify(struct notifier_block *self,
-                                          unsigned long val, void *data)
-{
-       return 0;
-}
-#endif
 #endif                         /* _ASM_KPROBES_H */
index 7c98e547c6d85e89b6f9c2afeacb01899a5094c1..42ece411435ad032f3ea5afbf24d42fad164e706 100644 (file)
@@ -71,15 +71,7 @@ struct kprobe_ctlblk {
        struct prev_kprobe prev_kprobe;
 };
 
-#ifdef CONFIG_KPROBES
 extern int kprobe_exceptions_notify(struct notifier_block *self,
-                                   unsigned long val, void *data);
-#else                          /* !CONFIG_KPROBES */
-static inline int kprobe_exceptions_notify(struct notifier_block *self,
-                                          unsigned long val, void *data)
-{
-       return 0;
-}
-#endif
+                                       unsigned long val, void *data);
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_KPROBES_H */
index 7ba845320f5c05d0d9450d89cbf2dacf72b72819..1b47e0d2ee931eb84db80c7668fd747f1f0092de 100644 (file)
@@ -38,15 +38,6 @@ struct kprobe_ctlblk {
        struct prev_kprobe prev_kprobe;
 };
 
-#ifdef CONFIG_KPROBES
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                                    unsigned long val, void *data);
-#else                          /* !CONFIG_KPROBES */
-static inline int kprobe_exceptions_notify(struct notifier_block *self,
-                                          unsigned long val, void *data)
-{
-       return 0;
-}
-#endif
-
 #endif /* _SPARC64_KPROBES_H */