diff options
author | Luiz Fernando Capitulino <lcapitulino@mandriva.com.br> | 2006-01-11 16:45:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:05:00 -0500 |
commit | 68209407856507cda9d085470e8d28542ed1a941 (patch) | |
tree | 52ec3b64ab5a7a7c1eb169ca369ea4922704adb5 /arch/x86_64 | |
parent | 915f34e20c20ee383832bce0a4bc962d0c86be8d (diff) |
[PATCH] x86_64: Sparse warnings fix.
Fixes the following sparse warnings:
arch/x86_64/kernel/mce_amd.c:321:29: warning: Using plain integer as NULL pointer
arch/x86_64/kernel/mce_amd.c:410:41: warning: Using plain integer as NULL pointer
Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/kernel/mce_amd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/mce_amd.c b/arch/x86_64/kernel/mce_amd.c index 0b62a44ab34b..d3ad7d81266d 100644 --- a/arch/x86_64/kernel/mce_amd.c +++ b/arch/x86_64/kernel/mce_amd.c | |||
@@ -320,7 +320,7 @@ static struct kobj_type threshold_ktype = { | |||
320 | static __cpuinit int threshold_create_bank(unsigned int cpu, int bank) | 320 | static __cpuinit int threshold_create_bank(unsigned int cpu, int bank) |
321 | { | 321 | { |
322 | int err = 0; | 322 | int err = 0; |
323 | struct threshold_bank *b = 0; | 323 | struct threshold_bank *b = NULL; |
324 | 324 | ||
325 | #ifdef CONFIG_SMP | 325 | #ifdef CONFIG_SMP |
326 | if (cpu_core_id[cpu] && shared_bank[bank]) { /* symlink */ | 326 | if (cpu_core_id[cpu] && shared_bank[bank]) { /* symlink */ |
@@ -409,7 +409,7 @@ static __cpuinit void threshold_remove_bank(unsigned int cpu, int bank) | |||
409 | if (shared_bank[bank] && atomic_read(&b->kobj.kref.refcount) > 2) { | 409 | if (shared_bank[bank] && atomic_read(&b->kobj.kref.refcount) > 2) { |
410 | sprintf(name, "bank%i", bank); | 410 | sprintf(name, "bank%i", bank); |
411 | sysfs_remove_link(&per_cpu(device_threshold, cpu).kobj, name); | 411 | sysfs_remove_link(&per_cpu(device_threshold, cpu).kobj, name); |
412 | per_cpu(threshold_banks, cpu)[bank] = 0; | 412 | per_cpu(threshold_banks, cpu)[bank] = NULL; |
413 | } else { | 413 | } else { |
414 | kobject_unregister(&b->kobj); | 414 | kobject_unregister(&b->kobj); |
415 | kfree(per_cpu(threshold_banks, cpu)[bank]); | 415 | kfree(per_cpu(threshold_banks, cpu)[bank]); |