diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-28 20:58:53 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-28 20:58:53 +0300 |
| commit | 713d25dba93ec3e739e209cd13bf7e1e9b00171a (patch) | |
| tree | c9bb10963ea7146b40720f76d348d36847e7a4b0 /drivers/ide | |
| parent | 22824c536947d2a8c1130dd75e1e278288fbf899 (diff) | |
| parent | 2e3f0ab2bb4853694570b9610b1fcfbfa8fd295b (diff) | |
| download | linux-713d25dba93ec3e739e209cd13bf7e1e9b00171a.tar.xz | |
Merge branch 'parisc-4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parsic fixes from Helge Deller:
"One patch from Mikulas fixes a bug on parisc by artifically
incrementing the counter in pmd_free when the kernel tries to free
the preallocated pmd.
Other than that we now prevent that syscalls gets added without
incrementing __NR_Linux_syscalls and fix the initial pmd setup code
if a default page size greater than 4k has been selected"
* 'parisc-4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix pmd code to depend on PT_NLEVELS value, not on CONFIG_64BIT
parisc: mm: don't count preallocated pmds
parisc: Add compile-time check when adding new syscalls
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions