Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 63881
b: refs/heads/master
c: d2d0251
h: refs/heads/master
i:
  63879: f64188d
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Aug 11, 2007
1 parent 63f7ecf commit b97acd6
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: 08da5a2ca479c5e8805dc3f77fd77176c4293399
refs/heads/master: d2d0251f6faa2cf341500a44310bbaa815a8a972
4 changes: 2 additions & 2 deletions trunk/arch/i386/kernel/alternative.c
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ void __init alternative_instructions(void)
that might execute the to be patched code.
Other CPUs are not running. */
stop_nmi();
#ifdef CONFIG_MCE
#ifdef CONFIG_X86_MCE
stop_mce();
#endif

Expand Down Expand Up @@ -426,7 +426,7 @@ void __init alternative_instructions(void)
local_irq_restore(flags);

restart_nmi();
#ifdef CONFIG_MCE
#ifdef CONFIG_X86_MCE
restart_mce();
#endif
}
Expand Down

0 comments on commit b97acd6

Please sign in to comment.