[PATCH NOTFORMERGE 2/5] mm: revert madvise_inject_error line split

From: Oleksandr Natalenko
Date: Sun Jun 16 2019 - 05:03:42 EST


Just to highlight it after our conversation.

Signed-off-by: Oleksandr Natalenko <oleksandr@xxxxxxxxxx>
---
mm/madvise.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mm/madvise.c b/mm/madvise.c
index edb7184f665c..70aeb54f3e1c 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -1041,8 +1041,7 @@ static int madvise_common(struct task_struct *task, struct mm_struct *mm,

#ifdef CONFIG_MEMORY_FAILURE
if (behavior == MADV_HWPOISON || behavior == MADV_SOFT_OFFLINE)
- return madvise_inject_error(behavior,
- start, start + len_in);
+ return madvise_inject_error(behavior, start, start + len_in);
#endif

write = madvise_need_mmap_write(behavior);
--
2.22.0