diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
| commit | 770493524e9f623826765eb97c64d699f4752e4f (patch) | |
| tree | 304c718009aa32834511d45497adb8acba496088 /include/asm-generic | |
| parent | e4f7cc8c36e7cab391683db682402ab2f185bf92 (diff) | |
| parent | fe0fb58325e519008e2606a5aa2cff7ad23e212d (diff) | |
| download | lwn-770493524e9f623826765eb97c64d699f4752e4f.tar.gz lwn-770493524e9f623826765eb97c64d699f4752e4f.zip | |
Merge branch 'for-6.15/intel-ish' into for-linus
- intel-ish Kbuild cleanup (Jiri Kosina)
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/hugetlb.h | 2 | ||||
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h index f42133dae68e..2afc95bf1655 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -90,7 +90,7 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, #ifndef __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm, - unsigned long addr, pte_t *ptep) + unsigned long addr, pte_t *ptep, unsigned long sz) { return ptep_get_and_clear(mm, addr, ptep); } diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 02a4adb4a999..0d5b186abee8 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -457,7 +457,7 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) . = ALIGN((align)); \ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ __start_rodata = .; \ - *(.rodata) *(.rodata.*) \ + *(.rodata) *(.rodata.*) *(.data.rel.ro*) \ SCHED_DATA \ RO_AFTER_INIT_DATA /* Read only after init */ \ . = ALIGN(8); \ |