asm-generic: fixes for v5.5

[Arnd Bergmann]

The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a:

  Linux 5.5-rc1 (2019-12-08 14:57:55 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git
tags/asm-generic-5.5

for you to fetch changes up to 060dc911501f6ee222569304f50962172a52b1d6:

  nds32: fix build failure caused by page table folding updates
(2019-12-30 11:19:05 +0100)

----------------------------------------------------------------
asm-generic: fixes for v5.5

Here are two bugfixes from Mike Rapoport, both fixing
compile-time errors on the nds32 architecture that
were recently introduced.

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

----------------------------------------------------------------
Mike Rapoport (2):
      asm-generic/nds32: don't redefine cacheflush primitives
      nds32: fix build failure caused by page table folding updates

 arch/nds32/include/asm/cacheflush.h | 11 +++++++----
 arch/nds32/include/asm/pgtable.h    |  2 +-
 include/asm-generic/cacheflush.h    | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 6 deletions(-)