diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 12:53:14 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 12:53:14 -0800 |
| commit | 6e9131cc43a672003a75483d9b9db5c51015ae5f (patch) | |
| tree | 23deb539a695272dc9f003b4ab094037ccc10f31 /kernel/time/timer_list.c | |
| parent | tty: Remove ASYNC_CLOSING (diff) | |
| parent | Linux 4.5-rc2 (diff) | |
| download | linux-dev-6e9131cc43a672003a75483d9b9db5c51015ae5f.tar.xz linux-dev-6e9131cc43a672003a75483d9b9db5c51015ae5f.zip | |
Merge 4.5-rc2 into tty-next
We want the tty/serial fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/time/timer_list.c')
| -rw-r--r-- | kernel/time/timer_list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c index f75e35b60149..ba7d8b288bb3 100644 --- a/kernel/time/timer_list.c +++ b/kernel/time/timer_list.c @@ -69,7 +69,7 @@ print_timer(struct seq_file *m, struct hrtimer *taddr, struct hrtimer *timer, print_name_offset(m, taddr); SEQ_printf(m, ", "); print_name_offset(m, timer->function); - SEQ_printf(m, ", S:%02lx", timer->state); + SEQ_printf(m, ", S:%02x", timer->state); #ifdef CONFIG_TIMER_STATS SEQ_printf(m, ", "); print_name_offset(m, timer->start_site); |