From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Mar 2016 06:13:48 +0000 (-0700)
Subject: Merge tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd... 
X-Git-Tag: v4.6-rc1~13
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=11caf57f6a4b8e380001548b8af0a3ae3f7b4354

Merge tag 'asm-generic-4.6' of git://git./linux/kernel/git/arnd/asm-generic

Pull asm-generic updates from Arnd Bergmann:
 "There are only three patches this time, most other changes to files in
  include/asm-generic tend to go through the tree of whoever depends on
  the change.

  Two patches are cleanups for stuff that is no longer needed, the main
  change is to adapt the generic version of BUG_ON() for CONFIG_BUG=n to
  make it behave consistently with BUG().

  This avoids undefined behavior along with a number of warnings about
  that undefined behavior in randconfig builds when we keep going on
  after hitting a BUG_ON()"

* tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: remove old nonatomic-io wrapper files
  asm-generic: default BUG_ON(x) to if(x)BUG()
  asm-generic: page.h: Remove useless get_user_page and free_user_page
---

11caf57f6a4b8e380001548b8af0a3ae3f7b4354
diff --cc arch/arc/include/asm/page.h
index 9a7cf521b95c,adf5cbb141a5..36da89e2c853
--- a/arch/arc/include/asm/page.h
+++ b/arch/arc/include/asm/page.h
@@@ -10,11 -10,9 +10,8 @@@
  
  #include <uapi/asm/page.h>
  
 -
  #ifndef __ASSEMBLY__
  
- #define get_user_page(vaddr)		__get_free_page(GFP_KERNEL)
- #define free_user_page(page, addr)	free_page(addr)
- 
  #define clear_page(paddr)		memset((paddr), 0, PAGE_SIZE)
  #define copy_page(to, from)		memcpy((to), (from), PAGE_SIZE)