diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 16:20:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 16:20:06 -0800 |
| commit | f47e2db43d6865358f35a7e2c7aa035321a6537a (patch) | |
| tree | 8ded6635ba91d5b6f23b700e504d69faa226f520 /arch/parisc/mm/fault.c | |
| parent | 606ed721afdbba2f560db87f33cbdb72463a5d7b (diff) | |
| parent | ef470a60e10eb12635d7b84c9502cea3028d44e8 (diff) | |
| download | blackbird-op-linux-f47e2db43d6865358f35a7e2c7aa035321a6537a.tar.gz blackbird-op-linux-f47e2db43d6865358f35a7e2c7aa035321a6537a.zip | |
Merge branch 'parisc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes and cleanups from Helge Deller:
"Nothing really important in this patchset: fix resource leaks in error
paths, coding style cleanups and code removal"
* 'parisc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Remove flush_user_dcache_range and flush_user_icache_range
parisc: fix a printk
parisc: ccio-dma: Handle return NULL error from ioremap_nocache
parisc: Define access_ok() as macro
parisc: eisa: Fix resource leaks in error paths
parisc: eisa: Remove coding style errors
Diffstat (limited to 'arch/parisc/mm/fault.c')
| -rw-r--r-- | arch/parisc/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index c3cac4ddfe9c..deab89a8915a 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -239,8 +239,8 @@ show_signal_msg(struct pt_regs *regs, unsigned long code, vma ? ',':'\n'); if (vma) - pr_warn(KERN_CONT " vm_start = 0x%08lx, vm_end = 0x%08lx\n", - vma->vm_start, vma->vm_end); + pr_cont(" vm_start = 0x%08lx, vm_end = 0x%08lx\n", + vma->vm_start, vma->vm_end); show_regs(regs); } |
