Commit 643aac1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  cpumask: Use cpu_*_mask accessors code: alpha
  cpumask: fix powernow-k8: partial revert of 2fdf66b4
parents ca77fde8 1371be0f

arch/alpha/kernel/process.c

+4 −4
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ common_shutdown_1(void *generic_ptr) 
	if (cpuid != boot_cpuid) {

		flags |= 0x00040000UL; /* "remain halted" */

		*pflags = flags;

		cpu_clear(cpuid, cpu_present_map);

		cpu_clear(cpuid, cpu_possible_map);

		set_cpu_present(cpuid, false);

		set_cpu_possible(cpuid, false);

		halt();

	}

#endif
@@ -120,8 +120,8 @@ common_shutdown_1(void *generic_ptr) 


#ifdef CONFIG_SMP

	/* Wait for the secondaries to halt. */

	cpu_clear(boot_cpuid, cpu_present_map);

	cpu_clear(boot_cpuid, cpu_possible_map);

	set_cpu_present(boot_cpuid, false);

	set_cpu_possible(boot_cpuid, false);

	while (cpus_weight(cpu_present_map))

		barrier();

#endif

arch/alpha/kernel/smp.c

+6 −6
Original line number Diff line number Diff line
@@ -120,12 +120,12 @@ void __cpuinit 
smp_callin(void)

{

	int cpuid = hard_smp_processor_id();

	cpumask_t mask = cpu_online_map;



	if (cpu_test_and_set(cpuid, mask)) {

	if (cpu_online(cpuid)) {

		printk("??, cpu 0x%x already present??\n", cpuid);

		BUG();

	}

	set_cpu_online(cpuid, true);



	/* Turn on machine checks.  */

	wrmces(7);
@@ -436,8 +436,8 @@ setup_smp(void) 
				((char *)cpubase + i*hwrpb->processor_size);

			if ((cpu->flags & 0x1cc) == 0x1cc) {

				smp_num_probed++;

				cpu_set(i, cpu_possible_map);

				cpu_set(i, cpu_present_map);

				set_cpu_possible(i, true);

				set_cpu_present(i, true);

				cpu->pal_revision = boot_cpu_palrev;

			}
@@ -470,8 +470,8 @@ smp_prepare_cpus(unsigned int max_cpus) 


	/* Nothing to do on a UP box, or when told not to.  */

	if (smp_num_probed == 1 || max_cpus == 0) {

		cpu_possible_map = cpumask_of_cpu(boot_cpuid);

		cpu_present_map = cpumask_of_cpu(boot_cpuid);

		init_cpu_possible(cpumask_of(boot_cpuid));

		init_cpu_present(cpumask_of(boot_cpuid));

		printk(KERN_INFO "SMP mode deactivated.\n");

		return;

	}

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+7 −5
Original line number Diff line number Diff line
@@ -1157,8 +1157,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) 
	data->cpu = pol->cpu;

	data->currpstate = HW_PSTATE_INVALID;



	rc = powernow_k8_cpu_init_acpi(data);

	if (rc) {

	if (powernow_k8_cpu_init_acpi(data)) {

		/*

		 * Use the PSB BIOS structure. This is only availabe on

		 * an UP version, and is deprecated by AMD.
@@ -1176,17 +1175,20 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) 
			       "ACPI maintainers and complain to your BIOS "

			       "vendor.\n");

#endif

			goto err_out;

			kfree(data);

			return -ENODEV;

		}

		if (pol->cpu != 0) {

			printk(KERN_ERR FW_BUG PFX "No ACPI _PSS objects for "

			       "CPU other than CPU0. Complain to your BIOS "

			       "vendor.\n");

			goto err_out;

			kfree(data);

			return -ENODEV;

		}

		rc = find_psb_table(data);

		if (rc) {

			goto err_out;

			kfree(data);

			return -ENODEV;

		}

		/* Take a crude guess here.

		 * That guess was in microseconds, so multiply with 1000 */