Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 99800
b: refs/heads/master
c: f59a931
h: refs/heads/master
v: v3
  • Loading branch information
Hiroshi Shimamoto authored and Ingo Molnar committed May 12, 2008
1 parent ded8cbd commit 34c9cdf
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: f784946ded3e734524d1f48a6a8286b8a152c3b9
refs/heads/master: f59a9310b97879159ef4d25227bc270278f1ee71
4 changes: 2 additions & 2 deletions trunk/arch/x86/kernel/nmi_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static __init void nmi_cpu_busy(void *data)

int __init check_nmi_watchdog(void)
{
int *prev_nmi_count;
unsigned int *prev_nmi_count;
int cpu;

if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DISABLED))
Expand Down Expand Up @@ -316,7 +316,7 @@ EXPORT_SYMBOL(touch_nmi_watchdog);
notrace __kprobes int
nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
{
int sum;
unsigned int sum;
int touched = 0;
int cpu = smp_processor_id();
int rc = 0;
Expand Down

0 comments on commit 34c9cdf

Please sign in to comment.