diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-15 13:06:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-15 13:06:06 -0700 |
| commit | 4b470f120817a16ea28da6141ea6e3a3040b297b (patch) | |
| tree | 8550d22831fb39fee6c758a5904c37ec81b9e2f7 /drivers | |
| parent | be5e32fc2e4b23ab443213f0c1b01cbc7ba645dc (diff) | |
| parent | d045c77c1a69703143a36169c224429c48b9eecd (diff) | |
| download | linux-4b470f120817a16ea28da6141ea6e3a3040b297b.tar.gz | |
Merge branch 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller: "One important patch which fixes crashes due to stack randomization on architectures where the stack grows upwards (currently parisc and metag only). This bug went unnoticed on parisc since kernel 3.14 where the flexible mmap memory layout support was added by commit 9dabf60dc4ab. The changes in fs/exec.c are inside an #ifdef CONFIG_STACK_GROWSUP section and will not affect other platforms. The other two patches rename args of the kthread_arg() function and fixes a printk output" * 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc,metag: Fix crashes due to stack randomization on stack-grows-upwards architectures parisc: copy_thread(): rename 'arg' argument to 'kthread_arg' parisc: %pf is only for function pointers
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/superio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index 8be2096c8423..deeaed544222 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c @@ -348,7 +348,7 @@ int superio_fixup_irq(struct pci_dev *pcidev) BUG(); return -1; } - printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %pf\n", + printk(KERN_DEBUG "superio_fixup_irq(%s) ven 0x%x dev 0x%x from %ps\n", pci_name(pcidev), pcidev->vendor, pcidev->device, __builtin_return_address(0)); |