diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /arch/i386/kernel/cpu/mtrr/generic.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/i386/kernel/cpu/mtrr/generic.c')
| -rw-r--r-- | arch/i386/kernel/cpu/mtrr/generic.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 | ||