diff options
author | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
commit | bf78296ab1cb215d0609ac6cff4e43e941e51265 (patch) | |
tree | a193615b327d9ee538e71ca5f13bbfb4f3db4e6b /mm/debug.c | |
parent | 18eb2f6e19d77900695987e3a2b775cccbe5b84e (diff) | |
parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) |
BackMerge v4.19-rc5 into drm-next
Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'mm/debug.c')
-rw-r--r-- | mm/debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/debug.c b/mm/debug.c index 38c926520c97..bd10aad8539a 100644 --- a/mm/debug.c +++ b/mm/debug.c | |||
@@ -114,7 +114,7 @@ EXPORT_SYMBOL(dump_vma); | |||
114 | 114 | ||
115 | void dump_mm(const struct mm_struct *mm) | 115 | void dump_mm(const struct mm_struct *mm) |
116 | { | 116 | { |
117 | pr_emerg("mm %px mmap %px seqnum %d task_size %lu\n" | 117 | pr_emerg("mm %px mmap %px seqnum %llu task_size %lu\n" |
118 | #ifdef CONFIG_MMU | 118 | #ifdef CONFIG_MMU |
119 | "get_unmapped_area %px\n" | 119 | "get_unmapped_area %px\n" |
120 | #endif | 120 | #endif |
@@ -142,7 +142,7 @@ void dump_mm(const struct mm_struct *mm) | |||
142 | "tlb_flush_pending %d\n" | 142 | "tlb_flush_pending %d\n" |
143 | "def_flags: %#lx(%pGv)\n", | 143 | "def_flags: %#lx(%pGv)\n", |
144 | 144 | ||
145 | mm, mm->mmap, mm->vmacache_seqnum, mm->task_size, | 145 | mm, mm->mmap, (long long) mm->vmacache_seqnum, mm->task_size, |
146 | #ifdef CONFIG_MMU | 146 | #ifdef CONFIG_MMU |
147 | mm->get_unmapped_area, | 147 | mm->get_unmapped_area, |
148 | #endif | 148 | #endif |