aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/smp.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-09-26 02:04:21 -0400
committerPaul Mackerras <paulus@samba.org>2005-09-26 02:04:21 -0400
commit14cf11af6cf608eb8c23e989ddb17a715ddce109 (patch)
tree271a97ce73e265f39c569cb159c195c5b4bb3f8c /include/asm-ppc/smp.h
parente5baa396af7560382d2cf3f0871d616b61fc284c (diff)
powerpc: Merge enough to start building in arch/powerpc.
This creates the directory structure under arch/powerpc and a bunch of Kconfig files. It does a first-cut merge of arch/powerpc/mm, arch/powerpc/lib and arch/powerpc/platforms/powermac. This is enough to build a 32-bit powermac kernel with ARCH=powerpc. For now we are getting some unmerged files from arch/ppc/kernel and arch/ppc/syslib, or arch/ppc64/kernel. This makes some minor changes to files in those directories and files outside arch/powerpc. The boot directory is still not merged. That's going to be interesting. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc/smp.h')
-rw-r--r--include/asm-ppc/smp.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/include/asm-ppc/smp.h b/include/asm-ppc/smp.h
index 829481c0a9dc..79c1be3dfe61 100644
--- a/include/asm-ppc/smp.h
+++ b/include/asm-ppc/smp.h
@@ -45,30 +45,21 @@ extern int __cpu_disable(void);
45extern void __cpu_die(unsigned int cpu); 45extern void __cpu_die(unsigned int cpu);
46extern void cpu_die(void) __attribute__((noreturn)); 46extern void cpu_die(void) __attribute__((noreturn));
47 47
48#define NO_PROC_ID 0xFF /* No processor magic marker */
49#define PROC_CHANGE_PENALTY 20
50
51#define raw_smp_processor_id() (current_thread_info()->cpu) 48#define raw_smp_processor_id() (current_thread_info()->cpu)
52 49
53extern int __cpu_up(unsigned int cpu); 50extern int __cpu_up(unsigned int cpu);
54 51
55extern int smp_hw_index[]; 52extern int smp_hw_index[];
56#define hard_smp_processor_id() (smp_hw_index[smp_processor_id()]) 53#define hard_smp_processor_id() (smp_hw_index[smp_processor_id()])
57 54#define get_hard_smp_processor_id(cpu) (smp_hw_index[(cpu)])
58struct klock_info_struct {
59 unsigned long kernel_flag;
60 unsigned char akp;
61};
62
63extern struct klock_info_struct klock_info;
64#define KLOCK_HELD 0xffffffff
65#define KLOCK_CLEAR 0x0
66 55
67#endif /* __ASSEMBLY__ */ 56#endif /* __ASSEMBLY__ */
68 57
69#else /* !(CONFIG_SMP) */ 58#else /* !(CONFIG_SMP) */
70 59
71static inline void cpu_die(void) { } 60static inline void cpu_die(void) { }
61#define get_hard_smp_processor_id(cpu) 0
62#define hard_smp_processor_id() 0
72 63
73#endif /* !(CONFIG_SMP) */ 64#endif /* !(CONFIG_SMP) */
74 65