diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 05:51:59 +0200 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 05:51:59 +0200 |
| commit | bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119 (patch) | |
| tree | 30180a33fb5bb9a5c633e93d533b7f4ffc800e2e /include/asm-powerpc/kprobes.h | |
| parent | Merge refs/heads/devtree from rsync://oak/kernels/iseries/work/.git (diff) | |
| download | linux-bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119.tar.xz linux-bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119.zip | |
powerpc: clean up after powermac build merge
Complete moving arch/ppc64/kernel/mpic.h,
include/asm-ppc/reg.h, include/asm-ppc64/kdebug.h
and include/asm-ppc64/kprobes.h
Add arch/powerpc/platforms/Makefile and use it from
arch/powerpc/Makefile
Introduce OLDARCH temporarily so we can point back to
the originating architecture
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'include/asm-powerpc/kprobes.h')
| -rw-r--r-- | include/asm-powerpc/kprobes.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-powerpc/kprobes.h b/include/asm-powerpc/kprobes.h index d9129d2b038e..b2f09f17fbe0 100644 --- a/include/asm-powerpc/kprobes.h +++ b/include/asm-powerpc/kprobes.h @@ -1,8 +1,7 @@ -#ifndef _ASM_KPROBES_H -#define _ASM_KPROBES_H +#ifndef _ASM_POWERPC_KPROBES_H +#define _ASM_POWERPC_KPROBES_H /* * Kernel Probes (KProbes) - * include/asm-ppc64/kprobes.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,4 +63,4 @@ static inline int kprobe_exceptions_notify(struct notifier_block *self, return 0; } #endif -#endif /* _ASM_KPROBES_H */ +#endif /* _ASM_POWERPC_KPROBES_H */ |