diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-14 12:28:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-14 12:28:08 -0700 |
| commit | 5910cfdce307d6e5c55d747809e3c670c9e8a9a7 (patch) | |
| tree | 52de74e98b3263f45b7d07c1d3000b199b0bc10d /drivers | |
| parent | Merge tag 'ntb-3.17' of git://github.com/jonmason/ntb (diff) | |
| parent | parisc: Implement new LWS CAS supporting 64 bit operations. (diff) | |
| download | linux-dev-5910cfdce307d6e5c55d747809e3c670c9e8a9a7.tar.xz linux-dev-5910cfdce307d6e5c55d747809e3c670c9e8a9a7.zip | |
Merge branch 'parisc-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"The most important patch is a new Light Weigth Syscall (LWS) for 8,
16, 32 and 64 bit atomic CAS operations which is required in order to
be able to implement the atomic gcc builtins on our platform.
Other than that, we wire up the seccomp, getrandom and memfd_create
syscalls, fixes a minor off-by-one bug and a wrong printk string"
* 'parisc-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Implement new LWS CAS supporting 64 bit operations.
parisc: Wire up seccomp, getrandom and memfd_create syscalls
parisc: dino: fix %d confusingly prefixed with 0x in format string
parisc: sys_hpux: NUL terminator is one past the end
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/dino.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 9eae9834bcc7..a0580afe1713 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -913,7 +913,7 @@ static int __init dino_probe(struct parisc_device *dev) printk("%s version %s found at 0x%lx\n", name, version, hpa); if (!request_mem_region(hpa, PAGE_SIZE, name)) { - printk(KERN_ERR "DINO: Hey! Someone took my MMIO space (0x%ld)!\n", + printk(KERN_ERR "DINO: Hey! Someone took my MMIO space (0x%lx)!\n", hpa); return 1; } |