leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- wire futex_waitv syscall

Browse Source 
- build fixes for lantiq and bcm63xx configs
 - yamon-dt bugfix
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmGVfWsaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHAOkg//e3wmqwno/WX5ekkLH9TU
 LEWe6mzqNMtjYjrebQJdCPPpfuN4AvNFSigL1nOg+YStTslEkiFSvJPMJ4f9BsKj
 6oJmOn/gkbeHv4/v3I2jV0kJwW1sUYDMvqSY6KIkS7aFCIuAlkt8WHze9RB7545N
 4Qmcqqcyd1OEI4rhGbR/JrIYosp3fqUg30WUQk3Z6bfYqrPdD3w38oWdx8Fe42p5
 wI76fmX68pS8l5iH1A/z0AofdtDAxYe7vPjKrlZR+U2ypJzbG2FOj1S74+pFKlss
 ONGgXY7DVjEsgZKacisDJ43u2XOLw77CGfN3g+150KVEpwBuCqXUGV9Fz4mKjsjl
 LwtcJ1VJRcHWHN3aPF07ZP+13pyX7R7WFikpMW3r+UteyvsmEXJtWElLhlev48EG
 WzUTJk+A8kVntUwcYiGNbLGs6psfxdFx1mEQQmSRYzhukACmESyCoPVf9dj16trl
 cwEzQdKv0M1Q/Dyaz17hrOi8TC4g6ScvSv0Cu3vHczSUSXgr/+71KBFdXP3HUXEd
 AG7oZIJe8hFaOCx7wP/3DmNV6NZlE/xcWQl9/aIqNBpAC3Bw5sjEcXAW/PfzV4iZ
 fr9d9Gn+Xze4McHD4uDIqRRMf40dXuPzFsxgXirzBNv0wzX2Lq4FHeirR1pHYQh4
 AlzD1ddJxIvNPC4Zu4M5IUY=
 =aV5f
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-11-17 15:12:50 -08:00
commit 3fa595481b
6 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/bcm63xx/clk.c
View File

@ -381,6 +381,12 @@ void clk_disable(struct clk *clk)
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)
{
if (!clk)

2
arch/mips/generic/yamon-dt.c
View File

@ -75,7 +75,7 @@ static unsigned int __init gen_fdt_mem_array(
__init int yamon_dt_append_memory(void *fdt,
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];
unsigned int mem_entries;
int i, err, mem_off;

1
arch/mips/kernel/syscalls/syscall_n32.tbl
View File

@ -387,3 +387,4 @@
446 n32 landlock_restrict_self sys_landlock_restrict_self
# 447 reserved for memfd_secret
448 n32 process_mrelease sys_process_mrelease
449 n32 futex_waitv sys_futex_waitv

1
arch/mips/kernel/syscalls/syscall_n64.tbl
View File

@ -363,3 +363,4 @@
446 n64 landlock_restrict_self sys_landlock_restrict_self
# 447 reserved for memfd_secret
448 n64 process_mrelease sys_process_mrelease
449 n64 futex_waitv sys_futex_waitv

1
arch/mips/kernel/syscalls/syscall_o32.tbl
View File

@ -436,3 +436,4 @@
446 o32 landlock_restrict_self sys_landlock_restrict_self
# 447 reserved for memfd_secret
448 o32 process_mrelease sys_process_mrelease
449 o32 futex_waitv sys_futex_waitv

6
arch/mips/lantiq/clk.c
View File

@ -158,6 +158,12 @@ void clk_deactivate(struct clk *clk)
}
EXPORT_SYMBOL(clk_deactivate);
struct clk *clk_get_parent(struct clk *clk)
{
return NULL;
}
EXPORT_SYMBOL(clk_get_parent);
static inline u32 get_counter_resolution(void)
{
u32 res;