diff options
author | Jens Axboe <axboe@kernel.dk> | 2017-06-22 21:55:24 -0600 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-06-22 21:55:24 -0600 |
commit | f95a0d6a95b12a79b7492da7ab687ae4cd741124 (patch) | |
tree | 503ad30af40e94bbc090fc7de45a051030646141 /arch/xtensa/kernel/setup.c | |
parent | a9590fe148c03cb4157b56255357419cb4e14124 (diff) | |
parent | 8e8320c9315c47a6a090188720ccff32a6a6ba18 (diff) |
Merge commit '8e8320c9315c' into for-4.13/block
Pull in the fix for shared tags, as it conflicts with the pending
changes in for-4.13/block. We already pulled in v4.12-rc5 to solve
other conflicts or get fixes that went into 4.12, so not a lot
of changes in this merge.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'arch/xtensa/kernel/setup.c')
-rw-r--r-- | arch/xtensa/kernel/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 394ef08300b6..33bfa5270d95 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -593,8 +593,7 @@ c_show(struct seq_file *f, void *slot) (ccount_freq/10000) % 100, loops_per_jiffy/(500000/HZ), (loops_per_jiffy/(5000/HZ)) % 100); - - seq_printf(f,"flags\t\t: " + seq_puts(f, "flags\t\t: " #if XCHAL_HAVE_NMI "nmi " #endif |