diff options
| author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 02:26:10 -0500 |
|---|---|---|
| committer | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 02:26:10 -0500 |
| commit | d121f07691415df824e6b60520f782f6d13b3c81 (patch) | |
| tree | 422ad3cc6fd631604fef4e469e49bacba8202e52 /fs/proc | |
| parent | 59858d3d54cfad1f8db67c2c07e4dd33bb6ed955 (diff) | |
| parent | 569d0365f571fa6421a5c80bc30d1b2cdab857fe (diff) | |
Merge branch 'for-4.16/dax' into libnvdimm-for-next
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 28fa85276eec..60316b52d659 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -2268,7 +2268,7 @@ static int show_timer(struct seq_file *m, void *v) | |||
| 2268 | notify = timer->it_sigev_notify; | 2268 | notify = timer->it_sigev_notify; |
| 2269 | 2269 | ||
| 2270 | seq_printf(m, "ID: %d\n", timer->it_id); | 2270 | seq_printf(m, "ID: %d\n", timer->it_id); |
| 2271 | seq_printf(m, "signal: %d/%p\n", | 2271 | seq_printf(m, "signal: %d/%px\n", |
| 2272 | timer->sigq->info.si_signo, | 2272 | timer->sigq->info.si_signo, |
| 2273 | timer->sigq->info.si_value.sival_ptr); | 2273 | timer->sigq->info.si_value.sival_ptr); |
| 2274 | seq_printf(m, "notify: %s/%s.%d\n", | 2274 | seq_printf(m, "notify: %s/%s.%d\n", |