Skip to content

Commit 3fa5954

Browse files
committed
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
2 parents ee1703c + fc1aabb commit 3fa5954

File tree

6 files changed

+16
-1
lines changed

6 files changed

+16
-1
lines changed

arch/mips/bcm63xx/clk.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,12 @@ void clk_disable(struct clk *clk)
381381

382382
EXPORT_SYMBOL(clk_disable);
383383

384+
struct clk *clk_get_parent(struct clk *clk)
385+
{
386+
return NULL;
387+
}
388+
EXPORT_SYMBOL(clk_get_parent);
389+
384390
unsigned long clk_get_rate(struct clk *clk)
385391
{
386392
if (!clk)

arch/mips/generic/yamon-dt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static unsigned int __init gen_fdt_mem_array(
7575
__init int yamon_dt_append_memory(void *fdt,
7676
const struct yamon_mem_region *regions)
7777
{
78-
unsigned long phys_memsize, memsize;
78+
unsigned long phys_memsize = 0, memsize;
7979
__be32 mem_array[2 * MAX_MEM_ARRAY_ENTRIES];
8080
unsigned int mem_entries;
8181
int i, err, mem_off;

arch/mips/kernel/syscalls/syscall_n32.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,3 +387,4 @@
387387
446 n32 landlock_restrict_self sys_landlock_restrict_self
388388
# 447 reserved for memfd_secret
389389
448 n32 process_mrelease sys_process_mrelease
390+
449 n32 futex_waitv sys_futex_waitv

arch/mips/kernel/syscalls/syscall_n64.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,3 +363,4 @@
363363
446 n64 landlock_restrict_self sys_landlock_restrict_self
364364
# 447 reserved for memfd_secret
365365
448 n64 process_mrelease sys_process_mrelease
366+
449 n64 futex_waitv sys_futex_waitv

arch/mips/kernel/syscalls/syscall_o32.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,3 +436,4 @@
436436
446 o32 landlock_restrict_self sys_landlock_restrict_self
437437
# 447 reserved for memfd_secret
438438
448 o32 process_mrelease sys_process_mrelease
439+
449 o32 futex_waitv sys_futex_waitv

arch/mips/lantiq/clk.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ void clk_deactivate(struct clk *clk)
158158
}
159159
EXPORT_SYMBOL(clk_deactivate);
160160

161+
struct clk *clk_get_parent(struct clk *clk)
162+
{
163+
return NULL;
164+
}
165+
EXPORT_SYMBOL(clk_get_parent);
166+
161167
static inline u32 get_counter_resolution(void)
162168
{
163169
u32 res;

0 commit comments

Comments
 (0)