mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-09 07:23:14 +00:00
[PATCH] kprobes: cleanup include/asm/kprobes.h
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>
This commit is contained in:
parent
2d14e39da8
commit
41dead49cc
@ -76,14 +76,6 @@ static inline void restore_interrupts(struct pt_regs *regs)
|
|||||||
local_irq_enable();
|
local_irq_enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_KPROBES
|
|
||||||
extern int kprobe_exceptions_notify(struct notifier_block *self,
|
extern int kprobe_exceptions_notify(struct notifier_block *self,
|
||||||
unsigned long val, void *data);
|
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 */
|
#endif /* _ASM_KPROBES_H */
|
||||||
|
@ -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,
|
extern int kprobe_exceptions_notify(struct notifier_block *self,
|
||||||
unsigned long val, void *data);
|
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 */
|
#endif /* _ASM_KPROBES_H */
|
||||||
|
@ -71,15 +71,7 @@ struct kprobe_ctlblk {
|
|||||||
struct prev_kprobe prev_kprobe;
|
struct prev_kprobe prev_kprobe;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_KPROBES
|
|
||||||
extern int kprobe_exceptions_notify(struct notifier_block *self,
|
extern int kprobe_exceptions_notify(struct notifier_block *self,
|
||||||
unsigned long val, void *data);
|
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 /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
#endif /* _ASM_POWERPC_KPROBES_H */
|
#endif /* _ASM_POWERPC_KPROBES_H */
|
||||||
|
@ -38,15 +38,6 @@ struct kprobe_ctlblk {
|
|||||||
struct prev_kprobe prev_kprobe;
|
struct prev_kprobe prev_kprobe;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_KPROBES
|
|
||||||
extern int kprobe_exceptions_notify(struct notifier_block *self,
|
extern int kprobe_exceptions_notify(struct notifier_block *self,
|
||||||
unsigned long val, void *data);
|
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 */
|
#endif /* _SPARC64_KPROBES_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user