From f380611092a6e794d43beda6062e742cc9091e23 Mon Sep 17 00:00:00 2001 From: Nathan Lynch Date: Wed, 13 Aug 2008 07:34:57 +1000 Subject: [PATCH] --- yaml --- r: 114506 b: refs/heads/master c: f3d3d307e6f577de3b384ef64ffb03c8b5676748 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/sysfs.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 13db1d49f126..1ae005e60083 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f6ba49207199cab60a4bdf43507666b93d12e18 +refs/heads/master: f3d3d307e6f577de3b384ef64ffb03c8b5676748 diff --git a/trunk/arch/powerpc/kernel/sysfs.c b/trunk/arch/powerpc/kernel/sysfs.c index 56d172d16e56..12058db70095 100644 --- a/trunk/arch/powerpc/kernel/sysfs.c +++ b/trunk/arch/powerpc/kernel/sysfs.c @@ -641,16 +641,9 @@ static void remove_cache_info(struct sys_device *sysdev) int cpu = sysdev->id; cache_desc = per_cpu(cache_desc, cpu); - if (cache_desc != NULL) { - sysfs_remove_file(&cache_desc->kobj, &cache_size_attr.attr); - sysfs_remove_file(&cache_desc->kobj, &cache_line_size_attr.attr); - sysfs_remove_file(&cache_desc->kobj, &cache_type_attr.attr); - sysfs_remove_file(&cache_desc->kobj, &cache_level_attr.attr); - sysfs_remove_file(&cache_desc->kobj, &cache_nr_sets_attr.attr); - sysfs_remove_file(&cache_desc->kobj, &cache_assoc_attr.attr); - + if (cache_desc != NULL) kobject_put(&cache_desc->kobj); - } + cache_toplevel = per_cpu(cache_toplevel, cpu); if (cache_toplevel != NULL) kobject_put(cache_toplevel);