Merge branch 'android12-5.10' into branch 'android12-5.10-lts'
Sync up with android12-5.10 for the following commits:fb39cdb9ea
ANDROID: export reclaim_pages1f8f6d59a2
ANDROID: vendor_hook: Add hook to not be stuck ro rmap lock in kswapd or direct_reclaim91bfc78bc0
ANDROID: Update symbol list for mtk02df0b2661
ANDROID: GKI: rockchip: Add symbols for cryptoefdf581d14
ANDROID: GKI: rockchip: Add symbol pci_disable_link_state504ce2d3a6
ANDROID: GKI: rockchip: Add symbols for sounda6b6bc98b7
ANDROID: GKI: rockchip: Add symbols for videof3a311b456
BACKPORT: f2fs: do not set compression bit if kernel doesn't supportb0988144b0
UPSTREAM: exfat: improve performance of exfat_free_cluster when using dirsync mount00d3b8c0cc
ANDROID: GKI: rockchip: Add symbols for drm dp936f1e35d1
UPSTREAM: arm64: perf: Support new DT compatiblesed931dc8ff
UPSTREAM: arm64: perf: Simplify registration boilerplatebb6c018ab6
UPSTREAM: arm64: perf: Support Denver and Carmel PMUsd306fd9d47
UPSTREAM: arm64: perf: add support for Cortex-A7809f78c3f7e
ANDROID: GKI: rockchip: Update symbol for devfreqe7ed66854e
ANDROID: GKI: rockchip: Update symbols for drma3e70ff5bf
ANDROID: GKI: Update symbols to symbol lista09241c6dd
UPSTREAM: ASoC: hdmi-codec: make hdmi_codec_controls static9eda09e511
UPSTREAM: ASoC: hdmi-codec: Add a prepare hook4ad97b395f
UPSTREAM: ASoC: hdmi-codec: Add iec958 controlsc0c2f6962d
UPSTREAM: ASoC: hdmi-codec: Rework to support more controls4c6eb3db8a
UPSTREAM: ALSA: iec958: Split status creation and fill580d2e7c78
UPSTREAM: ALSA: doc: Clarify IEC958 controls iface8b4bb1bca0
UPSTREAM: ASoC: hdmi-codec: remove unused spk_mask member5a2c4a5d1e
UPSTREAM: ASoC: hdmi-codec: remove useless initialization49e502f0c0
UPSTREAM: ASoC: codec: hdmi-codec: Support IEC958 encoded PCM format9bf69acb92
UPSTREAM: ASoC: hdmi-codec: Fix return value in hdmi_codec_set_jack()056409c7dc
UPSTREAM: ASoC: hdmi-codec: Add RX support5e75deab3a
UPSTREAM: ASoC: hdmi-codec: Get ELD in before reporting plugged eventd6207c39cb
ANDROID: GKI: rockchip: Add symbols for display driver1c3ed9d481
BACKPORT: KVM: x86/mmu: fix NULL pointer dereference on guest INVPCID843d3cb41b
BACKPORT: io_uring: always grab file table for deferred statx784cc16aed
BACKPORT: Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put2b377175a3
ANDROID: add two func in mm/memcontrol.ce56f8712cf
ANDROID: vendor_hooks: protect multi-mapcount pages in kernel3f775b9367
ANDROID: vendor_hooks: account page-mapcount1d2287f56e
FROMGIT: io_uring: Use original task for req identity in io_identity_cow()e0c9da25b2
FROMLIST: binder: fix UAF of ref->proc caused by race condition12f4322442
ANDROID: vendor_hooks: Guard cgroup struct with CONFIG_CGROUPS6532784c78
ANDROID: vendor_hooks: add hooks for remove_vm_area.c9a70dd592
ANDROID: GKI: allow mm vendor hooks header inclusion from header files039080d064
ANDROID: Update symbol list of mediatek9e8dedef1e
ANDROID: sched: add vendor hook to PELT multiplier573c7f061d
ANDROID: Guard hooks with their CONFIG_ options14f646cca5
ANDROID: fix kernelci issue for allnoconfig builds4442801a43
ANDROID: sched: Introducing PELT multiplierb2e5773ea4
FROMGIT: binder: fix redefinition of seq_file attributes9c2a5eef8f
Merge tag 'android12-5.10.117_r00' into 'android12-5.10'5fa1e1affc
ANDROID: GKI: pcie: Fix the broken dw_pcie structure51b3e17071
UPSTREAM: PCI: dwc: Support multiple ATU memory regionsa8d7f6518e
ANDROID: oplus: Update the ABI xml and symbol list4536de1b70
ANDROID: vendor_hooks: add hooks in __alloc_pages_slowpathd63c961c9d
ANDROID: GKI: Update symbols to symbol list41cbbe08f9
FROMGIT: arm64: fix oops in concurrently setting insn_emulation sysctlsc301d142e8
FROMGIT: usb: dwc3: core: Do not perform GCTL_CORE_SOFTRESET during bootup8b19ed264b
ANDROID: vendor_hooks:vendor hook for mmput242b11e574
ANDROID: vendor_hooks:vendor hook for pidfd_open0e1cb27700
ANDROID: vendor_hook: Add hook in shmem_writepage()8ee37d0bcd
BACKPORT: iommu/dma: Fix race condition during iova_domain initialization321bf845e1
FROMGIT: usb: dwc3: core: Deprecate GCTL.CORESOFTRESETc5eb0edfde
FROMGIT: usb: dwc3: gadget: Prevent repeat pullup()8de633b735
FROMGIT: Binder: add TF_UPDATE_TXN to replace outdated txne8fce59434
BACKPORT: FROMGIT: cgroup: Use separate src/dst nodes when preloading css_sets for migrationf26c566455
UPSTREAM: usb: gadget: f_uac2: allow changing interface name via configfs98fa7f7dfd
UPSTREAM: usb: gadget: f_uac1: allow changing interface name via configfs29172165ca
UPSTREAM: usb: gadget: f_uac1: Add suspend callbackff5468c71e
UPSTREAM: usb: gadget: f_uac2: Add suspend callback31e6d620c1
UPSTREAM: usb: gadget: u_audio: Add suspend call17643c1fdd
UPSTREAM: usb: gadget: u_audio: Rate ctl notifies about current srate (0=stopped)308955e3a6
UPSTREAM: usb: gadget: f_uac1: Support multiple sampling ratesae03eadb42
UPSTREAM: usb: gadget: f_uac2: Support multiple sampling ratesbedc53fae4
UPSTREAM: usb: gadget:audio: Replace deprecated macro S_IRUGO37e0d5eddb
UPSTREAM: usb: gadget: u_audio: Add capture/playback srate getter3251bb3250
UPSTREAM: usb: gadget: u_audio: Move dynamic srate from params to rtd530916be97
UPSTREAM: usb: gadget: u_audio: Support multiple sampling rates7f496d5a99
UPSTREAM: docs: ABI: fixed formatting in configfs-usb-gadget-uac22500cb53e6
UPSTREAM: usb: gadget: u_audio: Subdevice 0 for capture ctlsc386f34bd4
UPSTREAM: usb: gadget: u_audio: fix calculations for small bIntervalf74e3e2fe4
UPSTREAM: docs: ABI: fixed req_number desc in UAC102949bae5c
UPSTREAM: docs: ABI: added missing num_requests param to UAC2e1377ac38f
UPSTREAM: usb:gadget: f_uac1: fixed sync playback4b7c8905c5
UPSTREAM: usb: gadget: u_audio.c: Adding Playback Pitch ctl for sync playbacke29d2b5178
UPSTREAM: ABI: configfs-usb-gadget-uac2: fix a broken tableec313ae88d
UPSTREAM: ABI: configfs-usb-gadget-uac1: fix a broken tablebf46bbe087
UPSTREAM: usb: gadget: f_uac1: fixing inconsistent indentingb9c4cbbf7a
UPSTREAM: docs: usb: fix malformed tablea380b466e0
UPSTREAM: usb: gadget: f_uac1: add volume and mute supporte2c0816af2
BACKPORT: usb: gadget: f_uac2: add volume and mute support8430eb0243
UPSTREAM: usb: gadget: u_audio: add bi-directional volume and mute support257d21b184
UPSTREAM: usb: audio-v2: add ability to define feature unit descriptor1002747429
ANDROID: mm: shmem: use reclaim_pages() to recalim pages from a list6719763187
UPSTREAM: usb: gadget: f_uac1: disable IN/OUT ep if unused And add the new symbols being tracked due to abi additions from the android12-5.10 branch: Leaf changes summary: 85 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 69 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 16 Added variables 69 Added functions: [A] 'function void __dev_kfree_skb_irq(sk_buff*, skb_free_reason)' [A] 'function int __page_mapcount(page*)' [A] 'function int __traceiter_android_vh_add_page_to_lrulist(void*, page*, bool, lru_list)' [A] 'function int __traceiter_android_vh_alloc_pages_slowpath_begin(void*, gfp_t, unsigned int, unsigned long int*)' [A] 'function int __traceiter_android_vh_alloc_pages_slowpath_end(void*, gfp_t, unsigned int, unsigned long int)' [A] 'function int __traceiter_android_vh_del_page_from_lrulist(void*, page*, bool, lru_list)' [A] 'function int __traceiter_android_vh_do_traversal_lruvec(void*, lruvec*)' [A] 'function int __traceiter_android_vh_mark_page_accessed(void*, page*)' [A] 'function int __traceiter_android_vh_mutex_unlock_slowpath_end(void*, mutex*, task_struct*)' [A] 'function int __traceiter_android_vh_page_should_be_protected(void*, page*, bool*)' [A] 'function int __traceiter_android_vh_rwsem_mark_wake_readers(void*, rw_semaphore*, rwsem_waiter*)' [A] 'function int __traceiter_android_vh_rwsem_set_owner(void*, rw_semaphore*)' [A] 'function int __traceiter_android_vh_rwsem_set_reader_owned(void*, rw_semaphore*)' [A] 'function int __traceiter_android_vh_rwsem_up_read_end(void*, rw_semaphore*)' [A] 'function int __traceiter_android_vh_rwsem_up_write_end(void*, rw_semaphore*)' [A] 'function int __traceiter_android_vh_sched_pelt_multiplier(void*, unsigned int, unsigned int, int*)' [A] 'function int __traceiter_android_vh_show_mapcount_pages(void*, void*)' [A] 'function int __traceiter_android_vh_update_page_mapcount(void*, page*, bool, bool, bool*, bool*)' [A] 'function int __v4l2_ctrl_handler_setup(v4l2_ctrl_handler*)' [A] 'function int crypto_ahash_final(ahash_request*)' [A] 'function crypto_akcipher* crypto_alloc_akcipher(const char*, u32, u32)' [A] 'function int crypto_register_akcipher(akcipher_alg*)' [A] 'function void crypto_unregister_akcipher(akcipher_alg*)' [A] 'function int des_expand_key(des_ctx*, const u8*, unsigned int)' [A] 'function void dev_pm_opp_unregister_set_opp_helper(opp_table*)' [A] 'function net_device* devm_alloc_etherdev_mqs(device*, int, unsigned int, unsigned int)' [A] 'function mii_bus* devm_mdiobus_alloc_size(device*, int)' [A] 'function int devm_of_mdiobus_register(device*, mii_bus*, device_node*)' [A] 'function int devm_register_netdev(device*, net_device*)' [A] 'function bool disable_hardirq(unsigned int)' [A] 'function void do_traversal_all_lruvec()' [A] 'function drm_connector_status drm_bridge_detect(drm_bridge*)' [A] 'function edid* drm_bridge_get_edid(drm_bridge*, drm_connector*)' [A] 'function int drm_bridge_get_modes(drm_bridge*, drm_connector*)' [A] 'function int drm_dp_get_phy_test_pattern(drm_dp_aux*, drm_dp_phy_test_params*)' [A] 'function int drm_dp_read_desc(drm_dp_aux*, drm_dp_desc*, bool)' [A] 'function int drm_dp_read_dpcd_caps(drm_dp_aux*, u8*)' [A] 'function int drm_dp_read_sink_count(drm_dp_aux*)' [A] 'function int drm_dp_set_phy_test_pattern(drm_dp_aux*, drm_dp_phy_test_params*, u8)' [A] 'function uint64_t drm_format_info_min_pitch(const drm_format_info*, int, unsigned int)' [A] 'function int drm_mm_reserve_node(drm_mm*, drm_mm_node*)' [A] 'function bool drm_probe_ddc(i2c_adapter*)' [A] 'function void drm_self_refresh_helper_cleanup(drm_crtc*)' [A] 'function int drm_self_refresh_helper_init(drm_crtc*)' [A] 'function int get_pelt_halflife()' [A] 'function ssize_t hdmi_avi_infoframe_pack_only(const hdmi_avi_infoframe*, void*, size_t)' [A] 'function ssize_t iio_read_const_attr(device*, device_attribute*, char*)' [A] 'function bool mipi_dsi_packet_format_is_short(u8)' [A] 'function platform_device* of_device_alloc(device_node*, const char*, device*)' [A] 'function lruvec* page_to_lruvec(page*, pg_data_t*)' [A] 'function int pci_disable_link_state(pci_dev*, int)' [A] 'function int regmap_test_bits(regmap*, unsigned int, unsigned int)' [A] 'function unsigned int regulator_get_linear_step(regulator*)' [A] 'function int regulator_suspend_enable(regulator_dev*, suspend_state_t)' [A] 'function int rsa_parse_priv_key(rsa_key*, void*, unsigned int)' [A] 'function int rsa_parse_pub_key(rsa_key*, void*, unsigned int)' [A] 'function int sg_nents(scatterlist*)' [A] 'function int snd_pcm_create_iec958_consumer_default(u8*, size_t)' [A] 'function int snd_pcm_fill_iec958_consumer(snd_pcm_runtime*, u8*, size_t)' [A] 'function int snd_pcm_fill_iec958_consumer_hw_params(snd_pcm_hw_params*, u8*, size_t)' [A] 'function int snd_soc_dapm_force_bias_level(snd_soc_dapm_context*, snd_soc_bias_level)' [A] 'function int snd_soc_jack_add_zones(snd_soc_jack*, int, snd_soc_jack_zone*)' [A] 'function int snd_soc_jack_get_type(snd_soc_jack*, int)' [A] 'function void tcpm_tcpc_reset(tcpm_port*)' [A] 'function int v4l2_enum_dv_timings_cap(v4l2_enum_dv_timings*, const v4l2_dv_timings_cap*, v4l2_check_dv_timings_fnc*, void*)' [A] 'function void v4l2_print_dv_timings(const char*, const char*, const v4l2_dv_timings*, bool)' [A] 'function int v4l2_src_change_event_subdev_subscribe(v4l2_subdev*, v4l2_fh*, v4l2_event_subscription*)' [A] 'function void v4l2_subdev_notify_event(v4l2_subdev*, const v4l2_event*)' [A] 'function bool v4l2_valid_dv_timings(const v4l2_dv_timings*, const v4l2_dv_timings_cap*, v4l2_check_dv_timings_fnc*, void*)' 16 Added variables: [A] 'tracepoint __tracepoint_android_vh_add_page_to_lrulist' [A] 'tracepoint __tracepoint_android_vh_alloc_pages_slowpath_begin' [A] 'tracepoint __tracepoint_android_vh_alloc_pages_slowpath_end' [A] 'tracepoint __tracepoint_android_vh_del_page_from_lrulist' [A] 'tracepoint __tracepoint_android_vh_do_traversal_lruvec' [A] 'tracepoint __tracepoint_android_vh_mark_page_accessed' [A] 'tracepoint __tracepoint_android_vh_mutex_unlock_slowpath_end' [A] 'tracepoint __tracepoint_android_vh_page_should_be_protected' [A] 'tracepoint __tracepoint_android_vh_rwsem_mark_wake_readers' [A] 'tracepoint __tracepoint_android_vh_rwsem_set_owner' [A] 'tracepoint __tracepoint_android_vh_rwsem_set_reader_owned' [A] 'tracepoint __tracepoint_android_vh_rwsem_up_read_end' [A] 'tracepoint __tracepoint_android_vh_rwsem_up_write_end' [A] 'tracepoint __tracepoint_android_vh_sched_pelt_multiplier' [A] 'tracepoint __tracepoint_android_vh_show_mapcount_pages' [A] 'tracepoint __tracepoint_android_vh_update_page_mapcount' Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I47eefe85b949d3f358da95a9b6553660b9be0791
This commit is contained in:
@@ -1832,6 +1832,15 @@ static struct ctl_table kern_table[] = {
|
||||
.mode = 0644,
|
||||
.proc_handler = sched_rr_handler,
|
||||
},
|
||||
#ifdef CONFIG_SMP
|
||||
{
|
||||
.procname = "sched_pelt_multiplier",
|
||||
.data = &sysctl_sched_pelt_multiplier,
|
||||
.maxlen = sizeof(unsigned int),
|
||||
.mode = 0644,
|
||||
.proc_handler = sched_pelt_multiplier,
|
||||
},
|
||||
#endif
|
||||
#ifdef CONFIG_UCLAMP_TASK
|
||||
{
|
||||
.procname = "sched_util_clamp_min",
|
||||
|
Reference in New Issue
Block a user