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

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

diff --cc arch/arc/include/asm/page.h
index 9a7cf521b95c1a2c428a25b27d2d7df15676a0c7,adf5cbb141a5cdfae601dfa0d014e30aad99dec6..36da89e2c853ef0551bfcee0f145454e23a81dd6
--- 1/arch/arc/include/asm/page.h
--- 2/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)
  

diff --cc drivers/dma/idma64.h
Simple merge

diff --cc include/asm-generic/bug.h
Simple merge