github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 08:02:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

riscv fixes for 6.15-rc2

Browse Source 
* Correct typos in the documentation
 * Prevent module insertion failures by using kvmalloc to allocate the relocation hashtable
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQgN2CKhD/Nf5v80u9kP7K8koXvigUCZ/TVYgAKCRBkP7K8koXv
 iiXkAQCTK4BZzsyY+znGqgZAProEe/5DkyYibzVgSRX1GkGnUAEA7AtoxhoPLynv
 CINqIDHGf+NR2Y/rmGnQ1/Wl9Wd2qAM=
 =VRCR
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEAM520YNJYN/OiG3470yhUCzLq0EFAmf3+kETHHBhbG1lckBk
 YWJiZWx0LmNvbQAKCRDvTKFQLMurQWFeD/93vXbsTqPIivXcq/xr0g0awtjw5Ksy
 0rZvLRbL8eqyC9GQpEDlfZYzirsVH/juJmgmlB1iute5lqzRvgK/zjuXoxkRR2nq
 nAGzmuubJcMvqJfEdcRBdvuOhDGb+LvQqbCVH0XtnMJWXWZHq4BTq8wuB78PD2pH
 YKPtZkSQUpd5H0wuV828rYxSjE3RZ1dKrl1LsUYOVwAZt4W+kZ+XHoOsRhXOWiHw
 rngZ9Rq234vhrlwart/nR7IVciyd7fuOIo32BCv7+1IwJ78W8gstC7dDFhj8F4IO
 1uP7ukRtwOsiyBkr+zygpN1ExQ1FMwvUr5WVtwQatrPJw4h/Ho1RZJ2xvSixsCQd
 haQZk5kTtcM+uE6qQB+0vd+nogz6HCNK0iHkWSWuA+KvJ8M6dKChiTVLZ8RjxUde
 T9/rHtQXXfjda6j9fOjR3QNAkV+brrg8QbLp9xjKz2JTH2r9Y3unbjPyqpmEQeK0
 V6QkDBTiqAvyt2/BTI6fzTowxbW8uxJleXqOEqixLFIbuFavqBi/EfRWVXGXiozn
 0FV1ptpJim5Q++SQYbFrCRhSv/oZvaCPEUM9RFf7NpknOEtykYQfbGsAbhEO95Ei
 ahw09QMmmW77wwcIW95HvzyQaAz1BZ1DpV4f7J+248GBEM36KvRiOGmeZs8GDQOg
 9+P7Gz/Q9IT22g==
 =FY1B
 -----END PGP SIGNATURE-----

Merge tag 'riscv-fixes-6.15-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/alexghiti/linux into fixes

riscv fixes for 6.15-rc2

* Correct typos in the documentation
* Prevent module insertion failures by using kvmalloc to allocate the
  relocation hashtable.

* tag 'riscv-fixes-6.15-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/alexghiti/linux:
  Documentation: riscv: Fix typo MIMPLID -> MIMPID
  riscv: Use kvmalloc_array on relocation_hashtable
This commit is contained in:
Palmer Dabbelt 2025-04-10 10:04:53 -07:00
commit d6890adc70
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/arch/riscv/hwprobe.rst
View File

@ -51,7 +51,7 @@ The following keys are defined:
* :c:macro:`RISCV_HWPROBE_KEY_MARCHID`: Contains the value of ``marchid``, as
defined by the RISC-V privileged architecture specification.
* :c:macro:`RISCV_HWPROBE_KEY_MIMPLID`: Contains the value of ``mimplid``, as
* :c:macro:`RISCV_HWPROBE_KEY_MIMPID`: Contains the value of ``mimpid``, as
defined by the RISC-V privileged architecture specification.
* :c:macro:`RISCV_HWPROBE_KEY_BASE_BEHAVIOR`: A bitmask containing the base

9
arch/riscv/kernel/module.c
View File

@ -648,7 +648,7 @@ process_accumulated_relocations(struct module *me,
kfree(bucket_iter);
}
kfree(*relocation_hashtable);
kvfree(*relocation_hashtable);
}
static int add_relocation_to_accumulate(struct module *me, int type,
@ -752,9 +752,10 @@ initialize_relocation_hashtable(unsigned int num_relocations,
hashtable_size <<= should_double_size;
*relocation_hashtable = kmalloc_array(hashtable_size,
sizeof(**relocation_hashtable),
GFP_KERNEL);
/* Number of relocations may be large, so kvmalloc it */
*relocation_hashtable = kvmalloc_array(hashtable_size,
sizeof(**relocation_hashtable),
GFP_KERNEL);
if (!*relocation_hashtable)
return 0;