Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (be883da7) · Commits · 戴 / test

arch/sparc/kernel/pcic.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -896,13 +896,6 @@ static inline unsigned long get_irqmask(int irq_nr)
		return 1 << irq_nr;
		}

		static inline char *pcic_irq_itoa(unsigned int irq)
		{
		static char buff[16];
		sprintf(buff, "%d", irq);
		return buff;
		}

		static void pcic_disable_irq(unsigned int irq_nr)
		{
		unsigned long mask, flags;
		@@ -955,7 +948,6 @@ void __init sun4m_pci_init_IRQ(void)
		BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM);
		BTFIXUPSET_CALL(clear_profile_irq, pcic_clear_profile_irq, BTFIXUPCALL_NORM);
		BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM);
		BTFIXUPSET_CALL(__irq_itoa, pcic_irq_itoa, BTFIXUPCALL_NORM);
		}

		int pcibios_assign_resource(struct pci_dev *pdev, int resource)

arch/sparc/kernel/setup.c

+33 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <linux/console.h>
		#include <linux/spinlock.h>
		#include <linux/root_dev.h>
		#include <linux/cpu.h>

		#include <asm/system.h>
		#include <asm/io.h>
		@@ -348,6 +349,8 @@ void __init setup_arch(char **cmdline_p)
		init_mm.context = (unsigned long) NO_CONTEXT;
		init_task.thread.kregs = &fake_swapper_regs;

		smp_setup_cpu_possible_map();

		paging_init();
		}

		@@ -389,6 +392,8 @@ console_initcall(set_preferred_console);
		extern char *sparc_cpu_type;
		extern char *sparc_fpu_type;

		static int ncpus_probed;

		static int show_cpuinfo(struct seq_file m, void __unused)
		{
		seq_printf(m,
		@@ -411,7 +416,7 @@ static int show_cpuinfo(struct seq_file m, void __unused)
		romvec->pv_printrev >> 16,
		romvec->pv_printrev & 0xffff,
		&cputypval,
		num_possible_cpus(),
		ncpus_probed,
		num_online_cpus()
		#ifndef CONFIG_SMP
		, cpu_data(0).udelay_val/(500000/HZ),
		@@ -471,3 +476,30 @@ void sun_do_break(void)

		int serial_console = -1;
		int stop_a_enabled = 1;

		static int __init topology_init(void)
		{
		int i, ncpus, err;

		/* Count the number of physically present processors in
		* the machine, even on uniprocessor, so that /proc/cpuinfo
		* output is consistent with 2.4.x
		*/
		ncpus = 0;
		while (!cpu_find_by_instance(ncpus, NULL, NULL))
		ncpus++;
		ncpus_probed = ncpus;

		err = 0;
		for_each_online_cpu(i) {
		struct cpu p = kzalloc(sizeof(p), GFP_KERNEL);
		if (!p)
		err = -ENOMEM;
		else
		register_cpu(p, i, NULL);
		}

		return err;
		}

		subsys_initcall(topology_init);

arch/sparc/kernel/smp.c

+25 −11

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_NONE;
		/* Used to make bitops atomic */
		unsigned char bitops_spinlock = 0;

		void __init smp_store_cpu_info(int id)
		void __cpuinit smp_store_cpu_info(int id)
		{
		int cpu_node;

		@@ -267,22 +267,18 @@ int setup_profiling_timer(unsigned int multiplier)
		void __init smp_prepare_cpus(unsigned int max_cpus)
		{
		extern void smp4m_boot_cpus(void);
		int i, cpuid, ncpus, extra;
		int i, cpuid, extra;

		BUG_ON(sparc_cpu_model != sun4m);
		printk("Entering SMP Mode...\n");

		ncpus = 1;
		extra = 0;
		for (i = 0; !cpu_find_by_instance(i, NULL, &cpuid); i++) {
		if (cpuid == boot_cpu_id)
		continue;
		if (cpuid < NR_CPUS && ncpus++ < max_cpus)
		cpu_set(cpuid, phys_cpu_present_map);
		else
		if (cpuid >= NR_CPUS)
		extra++;
		}
		if (max_cpus >= NR_CPUS && extra)
		/* i = number of cpus */
		if (extra && max_cpus > i - extra)
		printk("Warning: NR_CPUS is too low to start all cpus\n");

		smp_store_cpu_info(boot_cpu_id);
		@@ -290,7 +286,25 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
		smp4m_boot_cpus();
		}

		void __devinit smp_prepare_boot_cpu(void)
		/* Set this up early so that things like the scheduler can init
		* properly. We use the same cpu mask for both the present and
		* possible cpu map.
		*/
		void __init smp_setup_cpu_possible_map(void)
		{
		int instance, mid;

		instance = 0;
		while (!cpu_find_by_instance(instance, NULL, &mid)) {
		if (mid < NR_CPUS) {
		cpu_set(mid, phys_cpu_present_map);
		cpu_set(mid, cpu_present_map);
		}
		instance++;
		}
		}

		void __init smp_prepare_boot_cpu(void)
		{
		int cpuid = hard_smp_processor_id();

		@@ -306,7 +320,7 @@ void __devinit smp_prepare_boot_cpu(void)
		cpu_set(cpuid, phys_cpu_present_map);
		}

		int __devinit __cpu_up(unsigned int cpu)
		int __cpuinit __cpu_up(unsigned int cpu)
		{
		extern int smp4m_boot_one_cpu(int);
		int ret;

arch/sparc/kernel/sparc_ksyms.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,6 @@ EXPORT_SYMBOL(BTFIXUP_CALL(__hard_smp_processor_id));
		#endif
		EXPORT_SYMBOL(BTFIXUP_CALL(enable_irq));
		EXPORT_SYMBOL(BTFIXUP_CALL(disable_irq));
		EXPORT_SYMBOL(BTFIXUP_CALL(__irq_itoa));
		EXPORT_SYMBOL(BTFIXUP_CALL(mmu_unlockarea));
		EXPORT_SYMBOL(BTFIXUP_CALL(mmu_lockarea));
		EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_sgl));

arch/sparc/kernel/sun4c_irq.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -198,8 +198,6 @@ static void __init sun4c_init_timers(irqreturn_t (counter_fn)(int, void , stru
		static void sun4c_nop(void) {}
		#endif

		extern char *sun4m_irq_itoa(unsigned int irq);

		void __init sun4c_init_IRQ(void)
		{
		struct linux_prom_registers int_regs[2];
		@@ -238,7 +236,6 @@ void __init sun4c_init_IRQ(void)
		BTFIXUPSET_CALL(clear_clock_irq, sun4c_clear_clock_irq, BTFIXUPCALL_NORM);
		BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP);
		BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP);
		BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);
		sparc_init_timers = sun4c_init_timers;
		#ifdef CONFIG_SMP
		BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);

Admin message