diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-29 11:36:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-29 11:36:47 -0700 |
| commit | d0cc7ecacba8a5b6bbdd5aa6ba3d1bc2fe59b580 (patch) | |
| tree | 5bbb05359ef01a90c54a06f8c92dcee1cb42d77f /arch/microblaze/mm/init.c | |
| parent | 77d51337d650086643e1e96b8a7e1e6cbf0b09ff (diff) | |
| parent | 47de4477a8e6bfd202640567ce4bf17cc1de60be (diff) | |
Merge tag 'microblaze-v5.13' of git://git.monstr.eu/linux-2.6-microblaze
Pull Microblaze updates from Michal Simek:
"No new features, just about cleaning up some code and moving to
generic syscall solution used by other architectures:
- Switch to generic syscall scripts
- Some small fixes"
* tag 'microblaze-v5.13' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: add 'fallthrough' to memcpy/memset/memmove
microblaze: Fix a typo
microblaze: tag highmem_setup() with __meminit
microblaze: syscalls: switch to generic syscallhdr.sh
microblaze: syscalls: switch to generic syscalltbl.sh
Diffstat (limited to 'arch/microblaze/mm/init.c')
| -rw-r--r-- | arch/microblaze/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 181e48782e6c..05cf1fb3f5ff 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -52,7 +52,7 @@ static void __init highmem_init(void) pkmap_page_table = virt_to_kpte(PKMAP_BASE); } -static void highmem_setup(void) +static void __meminit highmem_setup(void) { unsigned long pfn; |