Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1317563

[PATCH 1/2 v2] arm, arm64: change_memory_common with numpages == 0 should be no-op.

From <mika.penttila@nextfour.com>
Newsgroups linux.kernel
Subject [PATCH 1/2 v2] arm, arm64: change_memory_common with numpages == 0 should be no-op.
Date 2016-01-26 07:40 +0100
Message-ID <qV5se-86A-7@gated-at.bofh.it> (permalink)
References <qV5se-86A-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Mika Penttilä <mika.penttila@nextfour.com>

This makes the caller set_memory_xx() consistent with x86.

arm64 part is rebased on 4.5.0-rc1 with Ard's patch
 lkml.kernel.org/g/<1453125665-26627-1-git-send-email-ard.biesheuvel@linaro.org>
applied.

Signed-off-by: Mika Penttilä mika.penttila@nextfour.com
Reviewed-by: Laura Abbott <labbott@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>

---
 arch/arm/mm/pageattr.c   | 3 +++
 arch/arm64/mm/pageattr.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c
index cf30daf..d19b1ad 100644
--- a/arch/arm/mm/pageattr.c
+++ b/arch/arm/mm/pageattr.c
@@ -49,6 +49,9 @@ static int change_memory_common(unsigned long addr, int numpages,
 		WARN_ON_ONCE(1);
 	}
 
+	if (!numpages)
+		return 0;
+
 	if (start < MODULES_VADDR || start >= MODULES_END)
 		return -EINVAL;
 
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 1360a02..b582fc2 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -53,6 +53,9 @@ static int change_memory_common(unsigned long addr, int numpages,
 		WARN_ON_ONCE(1);
 	}
 
+	if (!numpages)
+		return 0;
+
 	/*
 	 * Kernel VA mappings are always live, and splitting live section
 	 * mappings into page mappings may cause TLB conflicts. This means
-- 
1.9.1

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/2 v2] set_memory_xx fixes <mika.penttila@nextfour.com> - 2016-01-26 07:40 +0100
  [PATCH 1/2 v2] arm, arm64: change_memory_common with numpages == 0 should be no-op. <mika.penttila@nextfour.com> - 2016-01-26 07:40 +0100
  [PATCH 2/2 v2] make apply_to_page_range() more robust. <mika.penttila@nextfour.com> - 2016-01-26 07:40 +0100
  Re: [PATCH 0/2 v2] set_memory_xx fixes Russell King - ARM Linux <linux@arm.linux.org.uk> - 2016-01-26 15:40 +0100

csiph-web