projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CPUFREQ] Longhaul - Remove duplicate tables
[powerpc.git]
/
arch
/
i386
/
kernel
/
cpu
/
intel_cacheinfo.c
diff --git
a/arch/i386/kernel/cpu/intel_cacheinfo.c
b/arch/i386/kernel/cpu/intel_cacheinfo.c
index
e9f0b92
..
80b4c5d
100644
(file)
--- a/
arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/
arch/i386/kernel/cpu/intel_cacheinfo.c
@@
-480,12
+480,10
@@
static int __cpuinit detect_cache_attributes(unsigned int cpu)
if (num_cache_leaves == 0)
return -ENOENT;
if (num_cache_leaves == 0)
return -ENOENT;
- cpuid4_info[cpu] = k
m
alloc(
+ cpuid4_info[cpu] = k
z
alloc(
sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL);
if (unlikely(cpuid4_info[cpu] == NULL))
return -ENOMEM;
sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL);
if (unlikely(cpuid4_info[cpu] == NULL))
return -ENOMEM;
- memset(cpuid4_info[cpu], 0,
- sizeof(struct _cpuid4_info) * num_cache_leaves);
oldmask = current->cpus_allowed;
retval = set_cpus_allowed(current, cpumask_of_cpu(cpu));
oldmask = current->cpus_allowed;
retval = set_cpus_allowed(current, cpumask_of_cpu(cpu));
@@
-658,17
+656,14
@@
static int __cpuinit cpuid4_cache_sysfs_init(unsigned int cpu)
return -ENOENT;
/* Allocate all required memory */
return -ENOENT;
/* Allocate all required memory */
- cache_kobject[cpu] = k
m
alloc(sizeof(struct kobject), GFP_KERNEL);
+ cache_kobject[cpu] = k
z
alloc(sizeof(struct kobject), GFP_KERNEL);
if (unlikely(cache_kobject[cpu] == NULL))
goto err_out;
if (unlikely(cache_kobject[cpu] == NULL))
goto err_out;
- memset(cache_kobject[cpu], 0, sizeof(struct kobject));
- index_kobject[cpu] = k
m
alloc(
+ index_kobject[cpu] = k
z
alloc(
sizeof(struct _index_kobject ) * num_cache_leaves, GFP_KERNEL);
if (unlikely(index_kobject[cpu] == NULL))
goto err_out;
sizeof(struct _index_kobject ) * num_cache_leaves, GFP_KERNEL);
if (unlikely(index_kobject[cpu] == NULL))
goto err_out;
- memset(index_kobject[cpu], 0,
- sizeof(struct _index_kobject) * num_cache_leaves);
return 0;
return 0;
@@
-759,7
+754,7
@@
static int __cpuinit cache_sysfs_init(void)
if (num_cache_leaves == 0)
return 0;
if (num_cache_leaves == 0)
return 0;
- register_cpu_notifier(&cacheinfo_cpu_notifier);
+ register_
hot
cpu_notifier(&cacheinfo_cpu_notifier);
for_each_online_cpu(i) {
cacheinfo_cpu_callback(&cacheinfo_cpu_notifier, CPU_ONLINE,
for_each_online_cpu(i) {
cacheinfo_cpu_callback(&cacheinfo_cpu_notifier, CPU_ONLINE,