Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8631
b: refs/heads/master
c: 8478157
h: refs/heads/master
i:
  8629: f3356df
  8627: 854f80d
  8623: 389218e
v: v3
  • Loading branch information
Chuck Ebbert authored and Linus Torvalds committed Sep 12, 2005
1 parent 9a11d6e commit 394f967
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: a2d236b3ac8fcbbf1bae7d815294d258ba24e3f5
refs/heads/master: 847815760cc0f41985b3185d780aa4369fcb475d
4 changes: 2 additions & 2 deletions trunk/arch/x86_64/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@ void nmi_watchdog_tick (struct pt_regs * regs, unsigned reason)
== NOTIFY_STOP) {
local_set(&__get_cpu_var(alert_counter), 0);
return;
}
die_nmi("NMI Watchdog detected LOCKUP on CPU%d", regs);
}
die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs);
}
} else {
__get_cpu_var(last_irq_sum) = sum;
Expand Down

0 comments on commit 394f967

Please sign in to comment.