bugzilla: https://gitee.com/openeuler/kernel/issues/I7GJJY
Signed-off-by: Jialin Zhang zhangjialin11@huawei.com --- Module.kabi_aarch64 | 1 + Module.kabi_x86_64 | 2 ++ kabi_whitelist_aarch64 | 1 + kabi_whitelist_x86_64 | 2 ++ kernel.spec | 5 ++++- 5 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/Module.kabi_aarch64 b/Module.kabi_aarch64 index 104b60e..5aa0dd1 100644 --- a/Module.kabi_aarch64 +++ b/Module.kabi_aarch64 @@ -1111,6 +1111,7 @@ 0x21713595 hrtimer_init vmlinux EXPORT_SYMBOL_GPL 0x8dd504f3 hrtimer_start_range_ns vmlinux EXPORT_SYMBOL_GPL 0xa452f5f1 hrtimer_try_to_cancel vmlinux EXPORT_SYMBOL_GPL +0xbcb36fe4 hugetlb_optimize_vmemmap_key vmlinux EXPORT_SYMBOL 0xdda8dc9c __hw_addr_sync_dev vmlinux EXPORT_SYMBOL 0xc5d47b9a __hw_addr_unsync_dev vmlinux EXPORT_SYMBOL 0xea6847b6 hwmon_device_register vmlinux EXPORT_SYMBOL_GPL diff --git a/Module.kabi_x86_64 b/Module.kabi_x86_64 index 9c3ef26..5159a19 100644 --- a/Module.kabi_x86_64 +++ b/Module.kabi_x86_64 @@ -1236,6 +1236,7 @@ 0x21713595 hrtimer_init vmlinux EXPORT_SYMBOL_GPL 0x8dd504f3 hrtimer_start_range_ns vmlinux EXPORT_SYMBOL_GPL 0xa452f5f1 hrtimer_try_to_cancel vmlinux EXPORT_SYMBOL_GPL +0xbcb36fe4 hugetlb_optimize_vmemmap_key vmlinux EXPORT_SYMBOL 0xf689728b __hw_addr_sync_dev vmlinux EXPORT_SYMBOL 0x8b743647 __hw_addr_unsync_dev vmlinux EXPORT_SYMBOL 0xa3633bba hwmon_device_register vmlinux EXPORT_SYMBOL_GPL @@ -3108,6 +3109,7 @@ 0xd979a547 __x86_indirect_thunk_rdi vmlinux EXPORT_SYMBOL 0xb601be4c __x86_indirect_thunk_rdx vmlinux EXPORT_SYMBOL 0xa1f9a134 __x86_indirect_thunk_rsi vmlinux EXPORT_SYMBOL +0x5b8239ca __x86_return_thunk vmlinux EXPORT_SYMBOL 0x9114b616 __xa_alloc vmlinux EXPORT_SYMBOL 0xb04a43ad __xa_alloc_cyclic vmlinux EXPORT_SYMBOL 0x0a0ebc08 __xa_cmpxchg vmlinux EXPORT_SYMBOL diff --git a/kabi_whitelist_aarch64 b/kabi_whitelist_aarch64 index 58c9450..3ee346e 100644 --- a/kabi_whitelist_aarch64 +++ b/kabi_whitelist_aarch64 @@ -1112,6 +1112,7 @@ hrtimer_init hrtimer_start_range_ns hrtimer_try_to_cancel + hugetlb_optimize_vmemmap_key __hw_addr_sync_dev __hw_addr_unsync_dev hwmon_device_register diff --git a/kabi_whitelist_x86_64 b/kabi_whitelist_x86_64 index 4724b46..4cf5de1 100644 --- a/kabi_whitelist_x86_64 +++ b/kabi_whitelist_x86_64 @@ -1237,6 +1237,7 @@ hrtimer_init hrtimer_start_range_ns hrtimer_try_to_cancel + hugetlb_optimize_vmemmap_key __hw_addr_sync_dev __hw_addr_unsync_dev hwmon_device_register @@ -3109,6 +3110,7 @@ __x86_indirect_thunk_rdi __x86_indirect_thunk_rdx __x86_indirect_thunk_rsi + __x86_return_thunk __xa_alloc __xa_alloc_cyclic __xa_cmpxchg diff --git a/kernel.spec b/kernel.spec index 9ca5de2..8929234 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global upstream_sublevel 0 %global devel_release 153 %global maintenance_release .12.0 -%global pkg_release .89 +%global pkg_release .90
%define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -910,6 +910,9 @@ fi %endif
%changelog +* Tue Jun 27 2023 Jialin Zhang zhangjialin11@huawei.com - 5.10.0-153.12.0.90 +- Add hugetlb_optimize_vmemmap_key and __x86_return_thunk to kabi whitelist + * Sun Jun 25 2023 Zheng Zengkai zhengzengkai@huawei.com - 5.10.0-153.12.0.89 - !1189 [sync] PR-1177: net/sched: flower: fix possible OOB write in fl_set_geneve_opt() - !1226 [sync] PR-1221: media: rkvdec: fix use after free bug in rkvdec_remove
-
Jialin Zhang