git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
kernel
/
time
/
timer_list.c
diff --git
a/kernel/time/timer_list.c
b/kernel/time/timer_list.c
index 9d80db4747d4d6371dc023cde7f5cbc73e20d4fa..28265636b6c279311498d422401d29addbc1609b 100644
(file)
--- a/
kernel/time/timer_list.c
+++ b/
kernel/time/timer_list.c
@@
-84,7
+84,7
@@
print_active_timers(struct seq_file *m, struct hrtimer_clock_base *base,
next_one:
i = 0;
next_one:
i = 0;
- spin_lock_irqsave(&base->cpu_base->lock, flags);
+
raw_
spin_lock_irqsave(&base->cpu_base->lock, flags);
curr = base->first;
/*
curr = base->first;
/*
@@
-100,13
+100,13
@@
next_one:
timer = rb_entry(curr, struct hrtimer, node);
tmp = *timer;
timer = rb_entry(curr, struct hrtimer, node);
tmp = *timer;
- spin_unlock_irqrestore(&base->cpu_base->lock, flags);
+
raw_
spin_unlock_irqrestore(&base->cpu_base->lock, flags);
print_timer(m, timer, &tmp, i, now);
next++;
goto next_one;
}
print_timer(m, timer, &tmp, i, now);
next++;
goto next_one;
}
- spin_unlock_irqrestore(&base->cpu_base->lock, flags);
+
raw_
spin_unlock_irqrestore(&base->cpu_base->lock, flags);
}
static void
}
static void