From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Mar 2015 17:58:53 +0000 (-0700)
Subject: Merge branch 'parisc-4.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v5.15~16094
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=713d25dba93ec3e739e209cd13bf7e1e9b00171a;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'parisc-4.0-1' of git://git./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
---

713d25dba93ec3e739e209cd13bf7e1e9b00171a