[PATCH] powerpc: merge code values for identifying platforms
This patch merges platform codes. systemcfg->platform is no longer used, systemcfg use in general is deprecated as much as possible (and renamed _systemcfg before it gets completely moved elsewhere in a future patch), _machine is now used on ppc64 along as ppc32. Platform codes aren't gone yet but we are getting a step closer. A bunch of asm code in head[_64].S is also turned into C code. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
@@ -44,6 +44,7 @@
|
||||
#include <asm/cputable.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/mpic.h>
|
||||
#include <asm/systemcfg.h>
|
||||
#ifdef CONFIG_PPC64
|
||||
#include <asm/paca.h>
|
||||
#endif
|
||||
@@ -368,7 +369,9 @@ int generic_cpu_disable(void)
|
||||
if (cpu == boot_cpuid)
|
||||
return -EBUSY;
|
||||
|
||||
systemcfg->processorCount--;
|
||||
#ifdef CONFIG_PPC64
|
||||
_systemcfg->processorCount--;
|
||||
#endif
|
||||
cpu_clear(cpu, cpu_online_map);
|
||||
fixup_irqs(cpu_online_map);
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user