Unverified Commit d6890adc authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Merge tag 'riscv-fixes-6.15-rc2' of... 

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
parents 0af2f6be 70fc03cd

Documentation/arch/riscv/hwprobe.rst

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/riscv/kernel/module.c

+5 −4
Original line number Diff line number Diff line
@@ -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,7 +752,8 @@ initialize_relocation_hashtable(unsigned int num_relocations, 


	hashtable_size <<= should_double_size;



	*relocation_hashtable = kmalloc_array(hashtable_size,

	/* Number of relocations may be large, so kvmalloc it */

	*relocation_hashtable = kvmalloc_array(hashtable_size,

					       sizeof(**relocation_hashtable),

					       GFP_KERNEL);

	if (!*relocation_hashtable)