summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_message.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-11 18:48:25 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-11 18:48:25 -0800
commitc17a1ca14cbba5585df67544711b6d04bcc8e240 (patch)
tree08935d5f57470bd26b8a6c6dca782cb195644eab /fs/xfs/xfs_message.c
parent596f63da42b92863b40ea4eb29c5b40bfa3e0ef5 (diff)
parentccda4af0f4b92f7b4c308d3acc262f4a7e3affad (diff)
Merge 4.20-rc2 into tty-next
We want the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/xfs/xfs_message.c')
-rw-r--r--fs/xfs/xfs_message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c
index 576c375ce12a..6b736ea58d35 100644
--- a/fs/xfs/xfs_message.c
+++ b/fs/xfs/xfs_message.c
@@ -107,5 +107,5 @@ assfail(char *expr, char *file, int line)
void
xfs_hex_dump(void *p, int length)
{
- print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_ADDRESS, 16, 1, p, length, 1);
+ print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_OFFSET, 16, 1, p, length, 1);
}