diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-01-12 21:22:34 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-12 21:22:34 +1100 |
| commit | 624cee31bcb14bfd85559fbec5dd7bb833542965 (patch) | |
| tree | f9e428498d88618f4f28b974a51591481ccfed0b /arch/powerpc/kernel/process.c | |
| parent | 8fce10a3c9ee7f9c74d83502fd5156a8ec82c21a (diff) | |
powerpc: make ARCH=ppc use arch/powerpc/kernel/process.c
Commit 5388fb1025443ec223ba556b10efc4c5f83f8682 made signal_32.c
use discard_lazy_cpu_state, which broke ARCH=ppc because that
uses the common signal_32.c but has its own process.c. Make ARCH=ppc
use the common process.c to fix this and to reduce the amount
of duplicated code.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 913f90692a3..9101358cc6b 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -223,6 +223,7 @@ void discard_lazy_cpu_state(void) } #endif /* CONFIG_SMP */ +#ifdef CONFIG_PPC_MERGE /* XXX for now */ int set_dabr(unsigned long dabr) { if (ppc_md.set_dabr) @@ -231,6 +232,7 @@ int set_dabr(unsigned long dabr) mtspr(SPRN_DABR, dabr); return 0; } +#endif #ifdef CONFIG_PPC64 DEFINE_PER_CPU(struct cpu_usage, cpu_usage_array); |