From 728d31770b69e4f04083e4cab4ef0b3bd08513d9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Dec 2007 09:23:20 -0800 Subject: [PATCH] --- yaml --- r: 75815 b: refs/heads/master c: 542eb75a27616bdde95c8d3764e0ab703579f8b5 h: refs/heads/master i: 75813: b954f1b4bdcc97fee48523ba3696599ac26409f5 75811: 51e27872bb98fadbba87ec2bc760f4aaf7dba64d 75807: 2f4ca6509b0f3cb6cae0b4f675ab564e5c9be174 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 124b5b98a762..3b54f380cfea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a521cf209c6e7042f85b2c5b16da3ffa8004fb7b +refs/heads/master: 542eb75a27616bdde95c8d3764e0ab703579f8b5 diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c index 2d65311d206e..ef15f35b10ed 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c @@ -432,10 +432,9 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu, else per_cpu(threshold_banks, cpu)[bank]->blocks = b; - kobject_set_name(&b->kobj, "misc%i", block); - b->kobj.parent = per_cpu(threshold_banks, cpu)[bank]->kobj; - b->kobj.ktype = &threshold_ktype; - err = kobject_register(&b->kobj); + err = kobject_init_and_add(&b->kobj, &threshold_ktype, + per_cpu(threshold_banks, cpu)[bank]->kobj, + "misc%i", block); if (err) goto out_free; recurse: @@ -451,6 +450,8 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu, if (err) goto out_free; + kobject_uevent(&b->kobj, KOBJ_ADD); + return err; out_free: