diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-16 13:27:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-16 13:27:34 -0700 |
| commit | 8757ae23a33d312bd09bd3b8c7824b3323954608 (patch) | |
| tree | 5b069bbd753090eaa8e89d33d3ab325124b57484 /arch/microblaze/include/asm/setup.h | |
| parent | 1660a76a87ffae74ad18b09e17ce4dcc5aa7308f (diff) | |
| parent | 101646a24a2f9cdb61d7732459fbf068a7bbb542 (diff) | |
Merge tag 'microblaze-4.16-rc6' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze fixes from Michal Simek:
- Use NO_BOOTMEM to fix boot issue
- Fix opt lib endian dependencies
* tag 'microblaze-4.16-rc6' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: switch to NO_BOOTMEM
microblaze: remove unused alloc_maybe_bootmem
microblaze: Setup dependencies for ASM optimized lib functions
Diffstat (limited to 'arch/microblaze/include/asm/setup.h')
| -rw-r--r-- | arch/microblaze/include/asm/setup.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h index be84a4d3917f..7c968c1d1729 100644 --- a/arch/microblaze/include/asm/setup.h +++ b/arch/microblaze/include/asm/setup.h @@ -44,7 +44,6 @@ void machine_shutdown(void); void machine_halt(void); void machine_power_off(void); -extern void *alloc_maybe_bootmem(size_t size, gfp_t mask); extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); # endif /* __ASSEMBLY__ */ |