Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41dead49 authored by Anil S Keshavamurthy's avatar Anil S Keshavamurthy Committed by Linus Torvalds
Browse files

[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: default avatarAnil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2d14e39d

include/asm-i386/kprobes.h

+0 −8
Original line number Diff line number Diff line
@@ -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 */

include/asm-ia64/kprobes.h

+0 −8
Original line number Diff line number Diff line
@@ -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 */

include/asm-powerpc/kprobes.h

+1 −9
Original line number Diff line number Diff line
@@ -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

#endif /* __KERNEL__ */

#endif	/* _ASM_POWERPC_KPROBES_H */

include/asm-sparc64/kprobes.h

+0 −9
Original line number Diff line number Diff line
@@ -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 */