diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 12:57:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 12:57:01 +0200 |
| commit | 6de9c70882ecdee63a652d493bf2353963bd4c22 (patch) | |
| tree | 9d219e705492331c97f5f7dccce3b0b1a29251bf /arch/x86/kernel/cpu/intel_cacheinfo.c | |
| parent | d406d21d90dce2e66c7eb4a44605aac947fe55fb (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| download | kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.tar.gz kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.tar.xz kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.zip | |
Merge branch 'linus' into x86/cleanups
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 650d40f7912..6b0a10b002f 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c @@ -516,7 +516,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; @@ -527,7 +526,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; |