aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-09-20 04:57:38 -0400
committerIngo Molnar <mingo@kernel.org>2012-09-20 04:57:38 -0400
commitbd13178169d5fd17da3221b55ba313270393649a (patch)
tree69f7a75359909a6d71a0dfa1ca96fc8f0e7e1b67
parent2efb05e8e9fa3510044e007b90263c73b6a83f84 (diff)
parent2d297480037e1d9100ca504737820c1bf65db6c0 (diff)
Merge tag 'microcode_fix_3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/microcode
Pull microcode changes from Borislav Petkov: "A small list usage correction from Dan Carpenter." Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/kernel/microcode_amd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 5511216b4434..7720ff5a9ee2 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -150,9 +150,9 @@ static void update_cache(struct ucode_patch *new_patch)
150 150
151static void free_cache(void) 151static void free_cache(void)
152{ 152{
153 struct ucode_patch *p; 153 struct ucode_patch *p, *tmp;
154 154
155 list_for_each_entry_reverse(p, &pcache, plist) { 155 list_for_each_entry_safe(p, tmp, &pcache, plist) {
156 __list_del(p->plist.prev, p->plist.next); 156 __list_del(p->plist.prev, p->plist.next);
157 kfree(p->data); 157 kfree(p->data);
158 kfree(p); 158 kfree(p);