diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-08 10:16:55 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-08 10:16:55 +0300 |
| commit | c9e9daccc7a6a670a6619723138ace6752f4773b (patch) | |
| tree | ed38356575314aec55deda66ef856a9bfeaaf282 /kernel/time/timer_list.c | |
| parent | 1f5e35636cc2737ccf1f67815cb33b978621f0f6 (diff) | |
| parent | ddce57a6f0a2d8d1bfacfa77f06043bc760403c2 (diff) | |
| download | linux-c9e9daccc7a6a670a6619723138ace6752f4773b.tar.xz | |
Merge branch 'topic/core-fixes' into for-next
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); |