From a13873e384a6ba27347d81a6ea1c4dd5a7b0e74b Mon Sep 17 00:00:00 2001 From: Fenghua Yu Date: Tue, 11 Aug 2009 14:52:11 -0700 Subject: [PATCH] --- yaml --- r: 156651 b: refs/heads/master c: 5359dffd4396f281c5b77de1acbee6fb1b333b23 h: refs/heads/master i: 156649: 6e4529e174b1019e5a24537ccbceec28f2394cd2 156647: 2d81b33d98fda09b82f45561279ada63a5f218f1 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/topology.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e25010a00b7f..b5c312c3ad37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf2a4c7270b9a22243a91ab5efcc47aaf997c66b +refs/heads/master: 5359dffd4396f281c5b77de1acbee6fb1b333b23 diff --git a/trunk/arch/ia64/kernel/topology.c b/trunk/arch/ia64/kernel/topology.c index bc80dff1df7a..8f060352e129 100644 --- a/trunk/arch/ia64/kernel/topology.c +++ b/trunk/arch/ia64/kernel/topology.c @@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, &cache_ktype_percpu_entry, &sys_dev->kobj, "%s", "cache"); + if (unlikely(retval < 0)) { + cpu_cache_sysfs_exit(cpu); + return retval; + } for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { this_object = LEAF_KOBJECT_PTR(cpu,i); @@ -385,7 +389,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) } kobject_put(&all_cpu_cache_info[cpu].kobj); cpu_cache_sysfs_exit(cpu); - break; + return retval; } kobject_uevent(&(this_object->kobj), KOBJ_ADD); }