Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d72aee78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k fixes from Geert Uytterhoeven:
 "Summary:

   - Add missing initialization of max_pfn, which is needed to make
     selftests/vm/mlock2-tests succeed,

   - Wire up new mlock2 syscall"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up mlock2
  m68knommu: Add missing initialization of max_pfn and {min,max}_low_pfn
  m68k/mm: sun3 - Add missing initialization of max_pfn and {min,max}_low_pfn
  m68k/mm: m54xx - Add missing initialization of max_pfn
  m68k/mm: motorola - Add missing initialization of max_pfn
parents 04527fda 21d380e5

arch/m68k/coldfire/m54xx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ static void __init mcf54xx_bootmem_alloc(void) 
	memstart = PAGE_ALIGN(_ramstart);

	memstart = PAGE_ALIGN(_ramstart);

	min_low_pfn = PFN_DOWN(_rambase);

	min_low_pfn = PFN_DOWN(_rambase);

	start_pfn = PFN_DOWN(memstart);

	start_pfn = PFN_DOWN(memstart);

	max_low_pfn = PFN_DOWN(_ramend);

	max_pfn = max_low_pfn = PFN_DOWN(_ramend);

	high_memory = (void *)_ramend;

	high_memory = (void *)_ramend;





	m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;

	m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;

arch/m68k/include/asm/unistd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <uapi/asm/unistd.h>

#include <uapi/asm/unistd.h>









#define NR_syscalls		375

#define NR_syscalls		376





#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_STAT

#define __ARCH_WANT_OLD_STAT

arch/m68k/include/uapi/asm/unistd.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -380,5 +380,6 @@ 
#define __NR_sendmmsg		372

#define __NR_sendmmsg		372

#define __NR_userfaultfd	373

#define __NR_userfaultfd	373

#define __NR_membarrier		374

#define __NR_membarrier		374

#define __NR_mlock2		375





#endif /* _UAPI_ASM_M68K_UNISTD_H_ */
 
#endif /* _UAPI_ASM_M68K_UNISTD_H_ */

arch/m68k/kernel/setup_no.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -238,11 +238,14 @@ void __init setup_arch(char **cmdline_p) 
	 * Give all the memory to the bootmap allocator, tell it to put the

	 * Give all the memory to the bootmap allocator, tell it to put the

	 * boot mem_map at the start of memory.

	 * boot mem_map at the start of memory.

	 */

	 */

	min_low_pfn = PFN_DOWN(memory_start);

	max_pfn = max_low_pfn = PFN_DOWN(memory_end);



	bootmap_size = init_bootmem_node(

	bootmap_size = init_bootmem_node(

			NODE_DATA(0),

			NODE_DATA(0),

			memory_start >> PAGE_SHIFT, /* map goes here */

			min_low_pfn,		/* map goes here */

			PAGE_OFFSET >> PAGE_SHIFT,	/* 0 on coldfire */

			PFN_DOWN(PAGE_OFFSET),

			memory_end >> PAGE_SHIFT);

			max_pfn);

	/*

	/*

	 * Free the usable memory, we have to make sure we do not free

	 * Free the usable memory, we have to make sure we do not free

	 * the bootmem bitmap so we then reserve it after freeing it :-)

	 * the bootmem bitmap so we then reserve it after freeing it :-)

arch/m68k/kernel/syscalltable.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -395,3 +395,4 @@ ENTRY(sys_call_table) 
	.long sys_sendmmsg

	.long sys_sendmmsg

	.long sys_userfaultfd

	.long sys_userfaultfd

	.long sys_membarrier

	.long sys_membarrier

	.long sys_mlock2		/* 375 */