Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branches 'core-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
Revert "lockdep, timer: Fix del_timer_sync() annotation"
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timer debug: Hide kernel addresses via %pK in /proc/timer_list
+5
-7
+2
-2
kernel/time/timer_list.c
+2
-2
kernel/time/timer_list.c
···
41
41
char symname[KSYM_NAME_LEN];
42
42
43
43
if (lookup_symbol_name((unsigned long)sym, symname) < 0)
44
-
SEQ_printf(m, "<%p>", sym);
44
+
SEQ_printf(m, "<%pK>", sym);
45
45
else
46
46
SEQ_printf(m, "%s", symname);
47
47
}
···
112
112
static void
113
113
print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
114
114
{
115
-
SEQ_printf(m, " .base: %p\n", base);
115
+
SEQ_printf(m, " .base: %pK\n", base);
116
116
SEQ_printf(m, " .index: %d\n",
117
117
base->index);
118
118
SEQ_printf(m, " .resolution: %Lu nsecs\n",
+3
-5
kernel/timer.c
+3
-5
kernel/timer.c
···
959
959
*
960
960
* Synchronization rules: Callers must prevent restarting of the timer,
961
961
* otherwise this function is meaningless. It must not be called from
962
-
* hardirq contexts. The caller must not hold locks which would prevent
962
+
* interrupt contexts. The caller must not hold locks which would prevent
963
963
* completion of the timer's handler. The timer's handler must not call
964
964
* add_timer_on(). Upon exit the timer is not queued and the handler is
965
965
* not running on any CPU.
···
971
971
#ifdef CONFIG_LOCKDEP
972
972
unsigned long flags;
973
973
974
-
raw_local_irq_save(flags);
975
-
local_bh_disable();
974
+
local_irq_save(flags);
976
975
lock_map_acquire(&timer->lockdep_map);
977
976
lock_map_release(&timer->lockdep_map);
978
-
_local_bh_enable();
979
-
raw_local_irq_restore(flags);
977
+
local_irq_restore(flags);
980
978
#endif
981
979
/*
982
980
* don't use it in hardirq context, because it