diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 10:55:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 10:55:23 -0700 |
| commit | 83650fd58a934fad5b7735fea96905ef986c0821 (patch) | |
| tree | eb052b937e912643958f0661b1e6ccd3c036a8e0 /arch/arm64/kernel/crash_dump.c | |
| parent | 3308a383ce99f739a3fa47dbd8564ab517562b51 (diff) | |
| parent | 966866892cf89d606544bca22d584ba2ef9ec208 (diff) | |
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull more arm64 updates from Catalin Marinas:
- fix W+X page (mark RO) allocated by the arm64 kprobes code
- Makefile fix for .i files in out of tree modules
* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: kprobe: make page to RO mode when allocate it
arm64: kdump: fix small typo
arm64: makefile fix build of .i file in external module case
Diffstat (limited to 'arch/arm64/kernel/crash_dump.c')
| -rw-r--r-- | arch/arm64/kernel/crash_dump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/crash_dump.c b/arch/arm64/kernel/crash_dump.c index f46d57c31443..6b5037ed15b2 100644 --- a/arch/arm64/kernel/crash_dump.c +++ b/arch/arm64/kernel/crash_dump.c @@ -58,7 +58,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, /** * elfcorehdr_read - read from ELF core header * @buf: buffer where the data is placed - * @csize: number of bytes to read + * @count: number of bytes to read * @ppos: address in the memory * * This function reads @count bytes from elf core header which exists |