diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 14:16:15 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 14:16:15 (GMT) |
| commit | 1a10390708d675ebf1a2f5e169a5165626afbd88 (patch) | |
| tree | d9ee7d10abd65e580fb74152a501089f51174225 /arch/x86/kernel/cpu/intel_cacheinfo.c | |
| parent | 239bd83104ec6bcba90221d8b0973d2565142ef8 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
| download | linux-fsl-qoriq-1a10390708d675ebf1a2f5e169a5165626afbd88.tar.xz | |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'arch/x86/kernel/cpu/intel_cacheinfo.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel_cacheinfo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 1677b553..3f46afb 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c @@ -540,7 +540,6 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu) unsigned long j; int retval; cpumask_t oldmask; - cpumask_of_cpu_ptr(newmask, cpu); if (num_cache_leaves == 0) return -ENOENT; @@ -551,7 +550,7 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu) return -ENOMEM; oldmask = current->cpus_allowed; - retval = set_cpus_allowed_ptr(current, newmask); + retval = set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu)); if (retval) goto out; |