| Message ID | 1607582998-13098-1-git-send-email-yejune.deng@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | sh: kdump: add some attribute to function | expand |
On 12/10/20 7:49 AM, Yejune Deng wrote: > add '__iomem' for ioremap() and '__user' for copy_to_user(). > > Signed-off-by: Yejune Deng <yejune.deng@gmail.com> > --- > arch/sh/kernel/crash_dump.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/sh/kernel/crash_dump.c b/arch/sh/kernel/crash_dump.c > index a908612..5b41b59 100644 > --- a/arch/sh/kernel/crash_dump.c > +++ b/arch/sh/kernel/crash_dump.c > @@ -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; > } Successfully boot-tested on my SH-7785LCR. No regressions. Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
diff --git a/arch/sh/kernel/crash_dump.c b/arch/sh/kernel/crash_dump.c index a908612..5b41b59 100644 --- a/arch/sh/kernel/crash_dump.c +++ b/arch/sh/kernel/crash_dump.c @@ -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; }
add '__iomem' for ioremap() and '__user' for copy_to_user(). Signed-off-by: Yejune Deng <yejune.deng@gmail.com> --- arch/sh/kernel/crash_dump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)