Skip to contentSkip to conversation

sh: kdump: add some attribute to function

PATCH In review Yejune Deng 2 participants 2 messages Dec 10, 2020 – Jan 18, 2021 SuperH

lore
Share & tools
lore

Yejune Deng

author
#0 lore raw

PATCH 1/1 sh: kdump: add some attribute to function

add '__iomem' for ioremap() and '__user' for copy_to_user().

Signed-off-by Yejune Deng <[email protected]>
---
 arch/sh/kernel/crash_dump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/sh/kernel/crash_dump.c +2 -2
index a908612..5b41b59 100644
@@ -26,7 +26,7 @@
 ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
                                size_t csize, unsigned long offset, int userbuf)
 {
-	void  *vaddr;
+	void  __iomem *vaddr;
 
 	if (!csize)
 		return 0;

@@ -34,7 +34,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
 	vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);
 
 	if (userbuf) {
-		if (copy_to_user(buf, (vaddr + offset), csize)) {
+		if (copy_to_user((void __user *)buf, (vaddr + offset), csize)) {
 			iounmap(vaddr);
 			return -EFAULT;
 		}
Signature · 1 line
1.9.1
maintainer Tested-by on v1 1/1
#1 lore raw
Quoted 21 lines · Yejune Deng

add '__iomem' for ioremap() and '__user' for copy_to_user().

Signed-off-by Yejune Deng <[email protected]>
---
 arch/sh/kernel/crash_dump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/sh/kernel/crash_dump.c +1 -1
index a908612..5b41b59 100644
@@ -26,7 +26,7 @@
 ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
                                size_t csize, unsigned long offset, int userbuf)
 {
-	void  *vaddr;
+	void  __iomem *vaddr;
 
 	if (!csize)
 		return 0;

arch/sh/kernel/crash_dump.c ssize_t copy_oldmem_page(unsigned long pfn, char *buf, · line 40

Quoted 8 lines
arch/sh/kernel/crash_dump.c +1 -1
@@ -34,7 +34,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
 	vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);
 
 	if (userbuf) {
-		if (copy_to_user(buf, (vaddr + offset), csize)) {
+		if (copy_to_user((void __user *)buf, (vaddr + offset), csize)) {
 			iounmap(vaddr);
 			return -EFAULT;
 		}

Successfully boot-tested on my SH-7785LCR. No regressions.

Tested-by John Paul Adrian Glaubitz <[email protected]>
Signature · 4 lines
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - [email protected]
`. `'   Freie Universitaet Berlin - [email protected]
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913