diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 09:13:48 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 09:13:48 +0300 |
| commit | 11caf57f6a4b8e380001548b8af0a3ae3f7b4354 (patch) | |
| tree | f77a131b252e7b6b5a7d6c0875a354240a8c2e67 /arch/m68k | |
| parent | 3d66c6ba3f978fa88d62b83ad35e9adc31c8ea9e (diff) | |
| parent | a1cbaad75a8f891bca9cc65a1fb95ae1b28d2f6a (diff) | |
| download | linux-11caf57f6a4b8e380001548b8af0a3ae3f7b4354.tar.xz | |
Merge tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/page_mm.h | 3 | ||||
| -rw-r--r-- | arch/m68k/include/asm/page_no.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index 5029f73e6294..e7a1946455a8 100644 --- a/arch/m68k/include/asm/page_mm.h +++ b/arch/m68k/include/asm/page_mm.h @@ -6,9 +6,6 @@ #include <linux/compiler.h> #include <asm/module.h> -#define get_user_page(vaddr) __get_free_page(GFP_KERNEL) -#define free_user_page(page, addr) free_page(addr) - /* * We don't need to check for alignment etc. */ diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h index ef209169579a..fa7f32d9836b 100644 --- a/arch/m68k/include/asm/page_no.h +++ b/arch/m68k/include/asm/page_no.h @@ -6,9 +6,6 @@ extern unsigned long memory_start; extern unsigned long memory_end; -#define get_user_page(vaddr) __get_free_page(GFP_KERNEL) -#define free_user_page(page, addr) free_page(addr) - #define clear_page(page) memset((page), 0, PAGE_SIZE) #define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) |