Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17997
b: refs/heads/master
c: 6820940
h: refs/heads/master
i:
  17995: cea7f5c
v: v3
  • Loading branch information
Luiz Fernando Capitulino authored and Linus Torvalds committed Jan 12, 2006
1 parent 7262d6a commit 787dc64
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 915f34e20c20ee383832bce0a4bc962d0c86be8d
refs/heads/master: 68209407856507cda9d085470e8d28542ed1a941
4 changes: 2 additions & 2 deletions trunk/arch/x86_64/kernel/mce_amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ static struct kobj_type threshold_ktype = {
static __cpuinit int threshold_create_bank(unsigned int cpu, int bank)
{
int err = 0;
struct threshold_bank *b = 0;
struct threshold_bank *b = NULL;

#ifdef CONFIG_SMP
if (cpu_core_id[cpu] && shared_bank[bank]) { /* symlink */
Expand Down Expand Up @@ -409,7 +409,7 @@ static __cpuinit void threshold_remove_bank(unsigned int cpu, int bank)
if (shared_bank[bank] && atomic_read(&b->kobj.kref.refcount) > 2) {
sprintf(name, "bank%i", bank);
sysfs_remove_link(&per_cpu(device_threshold, cpu).kobj, name);
per_cpu(threshold_banks, cpu)[bank] = 0;
per_cpu(threshold_banks, cpu)[bank] = NULL;
} else {
kobject_unregister(&b->kobj);
kfree(per_cpu(threshold_banks, cpu)[bank]);
Expand Down

0 comments on commit 787dc64

Please sign in to comment.