[uml-devel] 00_remove_cpu_number_map.diff

[Lennert B. <bu...@gn...>]

Bunch of SMP bitrot cleanups coming your way..


--- linux-2.4.17-1um-vanilla/include/asm-um/smp.h.orig	Sun Dec 30 16:24:33 2001
+++ linux-2.4.17-1um-vanilla/include/asm-um/smp.h	Sun Dec 30 16:24:42 2001
@@ -8,7 +8,7 @@
 
 #define smp_processor_id() (current->processor)
 #define cpu_logical_map(n) (n)
-extern int cpu_number_map[];
+#define cpu_number_map(n) (n)
 #define PROC_CHANGE_PENALTY	15 /* Pick a number, any number */
 extern int hard_smp_processor_id(void);
 #define NO_PROC_ID -1
--- linux-2.4.17-1um-vanilla/arch/um/kernel/smp.c.orig	Sun Dec 30 16:25:03 2001
+++ linux-2.4.17-1um-vanilla/arch/um/kernel/smp.c	Sun Dec 30 16:25:16 2001
@@ -26,9 +26,6 @@
 /* Per CPU bogomips and other parameters */
 struct cpuinfo_um cpu_data[NR_CPUS];
 
-/* which CPU maps to which logical number */
-int cpu_number_map[NR_CPUS];
-
 spinlock_t um_bh_lock = SPIN_LOCK_UNLOCKED;
 
 atomic_t global_bh_count;
--- linux-2.4.17-1um-vanilla/arch/um/kernel/process_kern.c.orig	Sun Dec 30 16:25:31 2001
+++ linux-2.4.17-1um-vanilla/arch/um/kernel/process_kern.c	Sun Dec 30 16:25:44 2001
@@ -161,7 +161,6 @@
 		cpu_tasks[cpu].task = task;
 		inited_cpus++;
 		init_tasks[cpu] = task;
-		cpu_number_map[cpu] = cpu;
 		task->processor = cpu;
 		cont_pid(extern_pid);
 	}