Commit 3fa59548 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes_5.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - wire futex_waitv syscall

 - build fixes for lantiq and bcm63xx configs

 - yamon-dt bugfix

* tag 'mips-fixes_5.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  mips: lantiq: add support for clk_get_parent()
  mips: bcm63xx: add support for clk_get_parent()
  MIPS: generic/yamon-dt: fix uninitialized variable error
  MIPS: syscalls: Wire up futex_waitv syscall
parents ee1703cd fc1aabb0

arch/mips/bcm63xx/clk.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -381,6 +381,12 @@ void clk_disable(struct clk *clk) 




EXPORT_SYMBOL(clk_disable);

EXPORT_SYMBOL(clk_disable);





struct clk *clk_get_parent(struct clk *clk)

{

	return NULL;

}

EXPORT_SYMBOL(clk_get_parent);



unsigned long clk_get_rate(struct clk *clk)

unsigned long clk_get_rate(struct clk *clk)

{

{

	if (!clk)

	if (!clk)

arch/mips/generic/yamon-dt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ static unsigned int __init gen_fdt_mem_array( 
__init int yamon_dt_append_memory(void *fdt,

__init int yamon_dt_append_memory(void *fdt,

				  const struct yamon_mem_region *regions)

				  const struct yamon_mem_region *regions)

{

{

	unsigned long phys_memsize, memsize;

	unsigned long phys_memsize = 0, memsize;

	__be32 mem_array[2 * MAX_MEM_ARRAY_ENTRIES];

	__be32 mem_array[2 * MAX_MEM_ARRAY_ENTRIES];

	unsigned int mem_entries;

	unsigned int mem_entries;

	int i, err, mem_off;

	int i, err, mem_off;

arch/mips/kernel/syscalls/syscall_n32.tbl

+1 −0
Original line number Original line Diff line number Diff line
@@ -387,3 +387,4 @@ 
446	n32	landlock_restrict_self		sys_landlock_restrict_self

446	n32	landlock_restrict_self		sys_landlock_restrict_self

# 447 reserved for memfd_secret

# 447 reserved for memfd_secret

448	n32	process_mrelease		sys_process_mrelease

448	n32	process_mrelease		sys_process_mrelease

449	n32	futex_waitv			sys_futex_waitv

arch/mips/kernel/syscalls/syscall_n64.tbl

+1 −0
Original line number Original line Diff line number Diff line
@@ -363,3 +363,4 @@ 
446	n64	landlock_restrict_self		sys_landlock_restrict_self

446	n64	landlock_restrict_self		sys_landlock_restrict_self

# 447 reserved for memfd_secret

# 447 reserved for memfd_secret

448	n64	process_mrelease		sys_process_mrelease

448	n64	process_mrelease		sys_process_mrelease

449	n64	futex_waitv			sys_futex_waitv

arch/mips/kernel/syscalls/syscall_o32.tbl

+1 −0
Original line number Original line Diff line number Diff line
@@ -436,3 +436,4 @@ 
446	o32	landlock_restrict_self		sys_landlock_restrict_self

446	o32	landlock_restrict_self		sys_landlock_restrict_self

# 447 reserved for memfd_secret

# 447 reserved for memfd_secret

448	o32	process_mrelease		sys_process_mrelease

448	o32	process_mrelease		sys_process_mrelease

449	o32	futex_waitv			sys_futex_waitv