diff options
| author |   Alexander Gordeev <agordeev@linux.ibm.com> | 2022-09-08 14:23:02 +0200 |
|---|---|---|
| committer |   Vasily Gorbik <gor@linux.ibm.com> | 2022-09-14 16:46:01 +0200 |
| commit | fba07cd4dd8fb4833015801a83f945b2d65a5c4b (patch) | |
| tree | 08701a6de4af267d6e035ce3101cca9da8b7569a /arch/s390/include/asm | |
| parent | s390/mm,ptdump: add real memory copy page markers (diff) | |
| download | linux-dev-fba07cd4dd8fb4833015801a83f945b2d65a5c4b.tar.xz linux-dev-fba07cd4dd8fb4833015801a83f945b2d65a5c4b.zip | |
s390/mm: uninline copy_oldmem_kernel() function
Uninline copy_oldmem_kernel() function and make it consistent
with a very similar memcpy_real() implementation, by moving
to code to crash_dump.c, where it actually belongs.
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/include/asm')
| -rw-r--r-- | arch/s390/include/asm/maccess.h | 3 | ||||
| -rw-r--r-- | arch/s390/include/asm/os_info.h | 14 |
2 files changed, 3 insertions, 14 deletions
diff --git a/arch/s390/include/asm/maccess.h b/arch/s390/include/asm/maccess.h index 21ebd9bf34cc..c7fa838cf6b9 100644 --- a/arch/s390/include/asm/maccess.h +++ b/arch/s390/include/asm/maccess.h @@ -10,5 +10,8 @@ extern unsigned long __memcpy_real_area; void memcpy_real_init(void); size_t memcpy_real_iter(struct iov_iter *iter, unsigned long src, size_t count); int memcpy_real(void *dest, unsigned long src, size_t count); +#ifdef CONFIG_CRASH_DUMP +int copy_oldmem_kernel(void *dst, unsigned long src, size_t count); +#endif #endif /* __ASM_S390_MACCESS_H */ diff --git a/arch/s390/include/asm/os_info.h b/arch/s390/include/asm/os_info.h index 85248d8fee0c..0d1c74a7a650 100644 --- a/arch/s390/include/asm/os_info.h +++ b/arch/s390/include/asm/os_info.h @@ -41,20 +41,6 @@ u32 os_info_csum(struct os_info *os_info); #ifdef CONFIG_CRASH_DUMP void *os_info_old_entry(int nr, unsigned long *size); -size_t copy_oldmem_iter(struct iov_iter *iter, unsigned long src, size_t count); - -static inline int copy_oldmem_kernel(void *dst, unsigned long src, size_t count) -{ - struct iov_iter iter; - struct kvec kvec; - - kvec.iov_base = dst; - kvec.iov_len = count; - iov_iter_kvec(&iter, WRITE, &kvec, 1, count); - if (copy_oldmem_iter(&iter, src, count) < count) - return -EFAULT; - return 0; -} #else static inline void *os_info_old_entry(int nr, unsigned long *size) { |