[PATCH] m32r: Fix cpu_possible_map and cpu_present_map initialization for SMP kernel (7c1c4e54) · Commits · 戴 / test

arch/m32r/kernel/setup.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@

		#include <linux/config.h>
		#include <linux/init.h>
		#include <linux/kernel.h>
		#include <linux/stddef.h>
		#include <linux/fs.h>
		#include <linux/sched.h>
		@@ -219,8 +220,6 @@ static unsigned long __init setup_memory(void)
		extern unsigned long setup_memory(void);
		#endif /* CONFIG_DISCONTIGMEM */

		#define M32R_PCC_PCATCR 0x00ef7014 /* will move to m32r.h */

		void __init setup_arch(char **cmdline_p)
		{
		ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
		@@ -269,15 +268,14 @@ void __init setup_arch(char **cmdline_p)
		paging_init();
		}

		static struct cpu cpu[NR_CPUS];
		static struct cpu cpu_devices[NR_CPUS];

		static int __init topology_init(void)
		{
		int cpu_id;
		int i;

		for (cpu_id = 0; cpu_id < NR_CPUS; cpu_id++)
		if (cpu_possible(cpu_id))
		register_cpu(&cpu[cpu_id], cpu_id, NULL);
		for_each_present_cpu(i)
		register_cpu(&cpu_devices[i], i, NULL);

		return 0;
		}

arch/m32r/kernel/smpboot.c

+10 −9

Original line number	Diff line number	Diff line
		@@ -39,8 +39,10 @@
		* Martin J. Bligh : Added support for multi-quad systems
		*/

		#include <linux/module.h>
		#include <linux/config.h>
		#include <linux/init.h>
		#include <linux/kernel.h>
		#include <linux/mm.h>
		#include <linux/smp_lock.h>
		#include <linux/irq.h>
		@@ -72,11 +74,15 @@ physid_mask_t phys_cpu_present_map;

		/* Bitmask of currently online CPUs */
		cpumask_t cpu_online_map;
		EXPORT_SYMBOL(cpu_online_map);

		cpumask_t cpu_bootout_map;
		cpumask_t cpu_bootin_map;
		cpumask_t cpu_callout_map;
		static cpumask_t cpu_callin_map;
		cpumask_t cpu_callout_map;
		EXPORT_SYMBOL(cpu_callout_map);
		cpumask_t cpu_possible_map = CPU_MASK_ALL;
		EXPORT_SYMBOL(cpu_possible_map);

		/* Per CPU bogomips and other parameters */
		struct cpuinfo_m32r cpu_data[NR_CPUS] __cacheline_aligned;
		@@ -110,7 +116,6 @@ static unsigned int calibration_result;

		void smp_prepare_boot_cpu(void);
		void smp_prepare_cpus(unsigned int);
		static void smp_tune_scheduling(void);
		static void init_ipi_lock(void);
		static void do_boot_cpu(int);
		int __cpu_up(unsigned int);
		@@ -177,6 +182,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
		}
		for (phys_id = 0 ; phys_id < nr_cpu ; phys_id++)
		physid_set(phys_id, phys_cpu_present_map);
		#ifndef CONFIG_HOTPLUG_CPU
		cpu_present_map = cpu_possible_map;
		#endif

		show_mp_info(nr_cpu);

		@@ -186,7 +194,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
		* Setup boot CPU information
		*/
		smp_store_cpu_info(0); /* Final full version of the data */
		smp_tune_scheduling();

		/*
		* If SMP should be disabled, then really disable it!
		@@ -230,11 +237,6 @@ smp_done:
		Dprintk("Boot done.\n");
		}

		static void __init smp_tune_scheduling(void)
		{
		/* Nothing to do. */
		}

		/*
		* init_ipi_lock : Initialize IPI locks.
		*/
		@@ -629,4 +631,3 @@ static void __init unmap_cpu_to_physid(int cpu_id, int phys_id)
		physid_2_cpu[phys_id] = -1;
		cpu_2_physid[cpu_id] = -1;
		}

include/asm-m32r/smp.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,8 @@ extern volatile int cpu_2_physid[NR_CPUS];
		#define raw_smp_processor_id() (current_thread_info()->cpu)

		extern cpumask_t cpu_callout_map;
		#define cpu_possible_map cpu_callout_map
		extern cpumask_t cpu_possible_map;
		extern cpumask_t cpu_present_map;

		static __inline__ int hard_smp_processor_id(void)
		{

Admin message