From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Jul 2008 01:37:44 +0000 (-0700)
Subject: Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.27-rc1~848
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26dcce0fabbef75ae426461edf21b5030bad60f3;p=linux-2.6

Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
  NR_CPUS: Replace NR_CPUS in speedstep-centrino.c
  cpumask: Provide a generic set of CPUMASK_ALLOC macros, FIXUP
  NR_CPUS: Replace NR_CPUS in cpufreq userspace routines
  NR_CPUS: Replace per_cpu(..., smp_processor_id()) with __get_cpu_var
  NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genapic_flat_64.c
  NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genx2apic_uv_x.c
  NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/proc.c
  NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/mcheck/mce_64.c
  cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c, fix
  cpumask: Use optimized CPUMASK_ALLOC macros in the centrino_target
  cpumask: Provide a generic set of CPUMASK_ALLOC macros
  cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c
  cpumask: Optimize cpumask_of_cpu in kernel/time/tick-common.c
  cpumask: Optimize cpumask_of_cpu in drivers/misc/sgi-xp/xpc_main.c
  cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/ldt.c
  cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/io_apic_64.c
  cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr
  Revert "cpumask: introduce new APIs"
  cpumask: make for_each_cpu_mask a bit smaller
  net: Pass reference to cpumask variable in net/sunrpc/svc.c
  ...

Fix up trivial conflicts in drivers/cpufreq/cpufreq.c manually
---

26dcce0fabbef75ae426461edf21b5030bad60f3
diff --cc drivers/cpufreq/cpufreq.c
index ee1df0d45e,d8f8b1e0ed..8d6a3ff026
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -898,8 -898,8 +898,8 @@@ static int cpufreq_add_dev(struct sys_d
  	}
  
  	spin_lock_irqsave(&cpufreq_driver_lock, flags);
- 	for_each_cpu_mask(j, policy->cpus) {
+ 	for_each_cpu_mask_nr(j, policy->cpus) {
 -		cpufreq_cpu_data[j] = policy;
 +		per_cpu(cpufreq_cpu_data, j) = policy;
  		per_cpu(policy_cpu, j) = policy->cpu;
  	}
  	spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
@@@ -945,8 -945,8 +945,8 @@@
  
  err_out_unregister:
  	spin_lock_irqsave(&cpufreq_driver_lock, flags);
- 	for_each_cpu_mask(j, policy->cpus)
+ 	for_each_cpu_mask_nr(j, policy->cpus)
 -		cpufreq_cpu_data[j] = NULL;
 +		per_cpu(cpufreq_cpu_data, j) = NULL;
  	spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
  
  	kobject_put(&policy->kobj);
@@@ -1024,14 -1024,14 +1024,14 @@@ static int __cpufreq_remove_dev(struct 
  
  	/* if we have other CPUs still registered, we need to unlink them,
  	 * or else wait_for_completion below will lock up. Clean the
 -	 * cpufreq_cpu_data[] while holding the lock, and remove the sysfs
 -	 * links afterwards.
 +	 * per_cpu(cpufreq_cpu_data) while holding the lock, and remove
 +	 * the sysfs links afterwards.
  	 */
  	if (unlikely(cpus_weight(data->cpus) > 1)) {
- 		for_each_cpu_mask(j, data->cpus) {
+ 		for_each_cpu_mask_nr(j, data->cpus) {
  			if (j == cpu)
  				continue;
 -			cpufreq_cpu_data[j] = NULL;
 +			per_cpu(cpufreq_cpu_data, j) = NULL;
  		}
  	}