diff options
| author | Olof Johansson <olof@lixom.net> | 2006-08-11 00:07:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 13:27:35 +1000 |
| commit | f39b7a55a84e34e3074b168e30dc73b66e85261d (patch) | |
| tree | 9be321bfcd5d0404309b1514127987117c2541cc /include/asm-powerpc/cputable.h | |
| parent | 2e97425197ecf85641a89e5a4868f8e147cc443f (diff) | |
| download | op-kernel-dev-f39b7a55a84e34e3074b168e30dc73b66e85261d.zip op-kernel-dev-f39b7a55a84e34e3074b168e30dc73b66e85261d.tar.gz | |
[POWERPC] Cleanup CPU inits
Cleanup CPU inits a bit more, Geoff Levand already did some earlier.
* Move CPU state save to cpu_setup, since cpu_setup is only ever done
on cpu 0 on 64-bit and save is never done more than once.
* Rename __restore_cpu_setup to __restore_cpu_ppc970 and add
function pointers to the cputable to use instead. Powermac always
has 970 so no need to check there.
* Rename __970_cpu_preinit to __cpu_preinit_ppc970 and check PVR before
calling it instead of in it, it's too early to use cputable.
* Rename pSeries_secondary_smp_init to generic_secondary_smp_init since
everyone but powermac and iSeries use it.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/cputable.h')
| -rw-r--r-- | include/asm-powerpc/cputable.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 1ba3c99..748bc18 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h @@ -36,6 +36,7 @@ struct cpu_spec; typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec); +typedef void (*cpu_restore_t)(void); enum powerpc_oprofile_type { PPC_OPROFILE_INVALID = 0, @@ -65,6 +66,8 @@ struct cpu_spec { * BHT, SPD, etc... from head.S before branching to identify_machine */ cpu_setup_t cpu_setup; + /* Used to restore cpu setup on secondary processors and at resume */ + cpu_restore_t cpu_restore; /* Used by oprofile userspace to select the right counters */ char *oprofile_cpu_type; |
