aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include/asm
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2015-03-18 16:42:54 -0400
committerRichard Weinberger <richard@nod.at>2015-04-13 15:00:58 -0400
commit28fa468f53163bc0b867b4cc75a9e36e7ed4dbbd (patch)
tree5421b0046c8143797630da85db9a9b72c488f9f2 /arch/um/include/asm
parentd0b5e15f0c0fdd759dd3dd48dc2dc2e7199e0da0 (diff)
um: Remove broken SMP support
At times where UML used the TT mode to operate it had kind of SMP support. It never got finished nor was stable. Let's rip out that cruft and stop confusing developers which do tree-wide SMP cleanups. If someone wants SMP support UML it has do be done from scratch. Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/include/asm')
-rw-r--r--arch/um/include/asm/processor-generic.h8
-rw-r--r--arch/um/include/asm/smp.h26
2 files changed, 0 insertions, 34 deletions
diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h
index cbc5edd5a901..2d1e0dd5bb0b 100644
--- a/arch/um/include/asm/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
@@ -98,16 +98,8 @@ struct cpuinfo_um {
98 98
99extern struct cpuinfo_um boot_cpu_data; 99extern struct cpuinfo_um boot_cpu_data;
100 100
101#define my_cpu_data cpu_data[smp_processor_id()]
102
103#ifdef CONFIG_SMP
104extern struct cpuinfo_um cpu_data[];
105#define current_cpu_data cpu_data[smp_processor_id()]
106#else
107#define cpu_data (&boot_cpu_data) 101#define cpu_data (&boot_cpu_data)
108#define current_cpu_data boot_cpu_data 102#define current_cpu_data boot_cpu_data
109#endif
110
111 103
112#define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) 104#define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf)
113extern unsigned long get_wchan(struct task_struct *p); 105extern unsigned long get_wchan(struct task_struct *p);
diff --git a/arch/um/include/asm/smp.h b/arch/um/include/asm/smp.h
index e4507938d8cf..9c3be355ed01 100644
--- a/arch/um/include/asm/smp.h
+++ b/arch/um/include/asm/smp.h
@@ -1,32 +1,6 @@
1#ifndef __UM_SMP_H 1#ifndef __UM_SMP_H
2#define __UM_SMP_H 2#define __UM_SMP_H
3 3
4#ifdef CONFIG_SMP
5
6#include <linux/bitops.h>
7#include <asm/current.h>
8#include <linux/cpumask.h>
9
10#define raw_smp_processor_id() (current_thread->cpu)
11
12#define cpu_logical_map(n) (n)
13#define cpu_number_map(n) (n)
14extern int hard_smp_processor_id(void);
15#define NO_PROC_ID -1
16
17extern int ncpus;
18
19
20static inline void smp_cpus_done(unsigned int maxcpus)
21{
22}
23
24extern struct task_struct *idle_threads[NR_CPUS];
25
26#else
27
28#define hard_smp_processor_id() 0 4#define hard_smp_processor_id() 0
29 5
30#endif 6#endif
31
32#endif