diff options
| author | Stephen Rothwell | 2005-09-27 05:51:59 +0200 |
|---|---|---|
| committer | Stephen Rothwell | 2005-09-27 05:51:59 +0200 |
| commit | bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119 (patch) | |
| tree | 30180a33fb5bb9a5c633e93d533b7f4ffc800e2e /arch/ppc64/kernel/traps.c | |
| parent | Merge refs/heads/devtree from rsync://oak/kernels/iseries/work/.git (diff) | |
| download | kernel-qcow2-linux-bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119.tar.gz kernel-qcow2-linux-bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119.tar.xz kernel-qcow2-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 'arch/ppc64/kernel/traps.c')
| -rw-r--r-- | arch/ppc64/kernel/traps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/traps.c b/arch/ppc64/kernel/traps.c index 5c4647b2c5f3..a728c9f0b53f 100644 --- a/arch/ppc64/kernel/traps.c +++ b/arch/ppc64/kernel/traps.c @@ -62,7 +62,7 @@ EXPORT_SYMBOL(__debugger_dabr_match); EXPORT_SYMBOL(__debugger_fault_handler); #endif -struct notifier_block *ppc64_die_chain; +struct notifier_block *powerpc_die_chain; static DEFINE_SPINLOCK(die_notifier_lock); int register_die_notifier(struct notifier_block *nb) @@ -71,7 +71,7 @@ int register_die_notifier(struct notifier_block *nb) unsigned long flags; spin_lock_irqsave(&die_notifier_lock, flags); - err = notifier_chain_register(&ppc64_die_chain, nb); + err = notifier_chain_register(&powerpc_die_chain, nb); spin_unlock_irqrestore(&die_notifier_lock, flags); return err; } |