diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 4 | ||||
-rw-r--r-- | arch/i386/kernel/cpu/mtrr/generic.c | 3 | ||||
-rw-r--r-- | arch/i386/kernel/io_apic.c | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c index 5c530064eb74..73a5dc5b26b8 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c | |||
@@ -648,9 +648,7 @@ static int powernow_cpu_exit (struct cpufreq_policy *policy) { | |||
648 | } | 648 | } |
649 | #endif | 649 | #endif |
650 | 650 | ||
651 | if (powernow_table) | 651 | kfree(powernow_table); |
652 | kfree(powernow_table); | ||
653 | |||
654 | return 0; | 652 | return 0; |
655 | } | 653 | } |
656 | 654 | ||
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c index f468a979e9aa..64d91f73a0a4 100644 --- a/arch/i386/kernel/cpu/mtrr/generic.c +++ b/arch/i386/kernel/cpu/mtrr/generic.c | |||
@@ -70,8 +70,7 @@ void __init get_mtrr_state(void) | |||
70 | /* Free resources associated with a struct mtrr_state */ | 70 | /* Free resources associated with a struct mtrr_state */ |
71 | void __init finalize_mtrr_state(void) | 71 | void __init finalize_mtrr_state(void) |
72 | { | 72 | { |
73 | if (mtrr_state.var_ranges) | 73 | kfree(mtrr_state.var_ranges); |
74 | kfree(mtrr_state.var_ranges); | ||
75 | mtrr_state.var_ranges = NULL; | 74 | mtrr_state.var_ranges = NULL; |
76 | } | 75 | } |
77 | 76 | ||
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index fc81c8cddd22..060c4ca4d69f 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
@@ -632,10 +632,8 @@ static int __init balanced_irq_init(void) | |||
632 | printk(KERN_ERR "balanced_irq_init: failed to spawn balanced_irq"); | 632 | printk(KERN_ERR "balanced_irq_init: failed to spawn balanced_irq"); |
633 | failed: | 633 | failed: |
634 | for (i = 0; i < NR_CPUS; i++) { | 634 | for (i = 0; i < NR_CPUS; i++) { |
635 | if(irq_cpu_data[i].irq_delta) | 635 | kfree(irq_cpu_data[i].irq_delta); |
636 | kfree(irq_cpu_data[i].irq_delta); | 636 | kfree(irq_cpu_data[i].last_irq); |
637 | if(irq_cpu_data[i].last_irq) | ||
638 | kfree(irq_cpu_data[i].last_irq); | ||
639 | } | 637 | } |
640 | return 0; | 638 | return 0; |
641 | } | 639 | } |