diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/kprobes.h | |
parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/kprobes.h')
-rw-r--r-- | include/asm-powerpc/kprobes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/kprobes.h b/include/asm-powerpc/kprobes.h index 6cd0a3bfa280..0654f79b06df 100644 --- a/include/asm-powerpc/kprobes.h +++ b/include/asm-powerpc/kprobes.h | |||
@@ -1,5 +1,6 @@ | |||
1 | #ifndef _ASM_POWERPC_KPROBES_H | 1 | #ifndef _ASM_POWERPC_KPROBES_H |
2 | #define _ASM_POWERPC_KPROBES_H | 2 | #define _ASM_POWERPC_KPROBES_H |
3 | #ifdef __KERNEL__ | ||
3 | /* | 4 | /* |
4 | * Kernel Probes (KProbes) | 5 | * Kernel Probes (KProbes) |
5 | * | 6 | * |
@@ -78,4 +79,5 @@ static inline int kprobe_exceptions_notify(struct notifier_block *self, | |||
78 | return 0; | 79 | return 0; |
79 | } | 80 | } |
80 | #endif | 81 | #endif |
82 | #endif /* __KERNEL__ */ | ||
81 | #endif /* _ASM_POWERPC_KPROBES_H */ | 83 | #endif /* _ASM_POWERPC_KPROBES_H */ |