A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android11-5.4' into 'android11-5.4-lts'

Browse source 
Sync up with android11-5.4 for the following commits:

fd0edef76b BACKPORT: FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once
fec1dfacf2 ANDROID: simplify vendor hooks for non-GKI builds
5327444e83 ANDROID: GKI: Add Sony KMI symbol list

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7855d17b81f75d5f0da8af28d8390dc5f5067323
This commit is contained in:
Greg Kroah-Hartman 2021-01-17 14:07:00 +01:00
commit d129ea2cdf
6 changed files with 1200 additions and 919 deletions
Download patch file Download diff file Expand all files Collapse all files

2097
android/abi_gki_aarch64.xml
View file

File diff suppressed because it is too large Load diff

40
android/abi_gki_aarch64_sony Normal file
View file

@ -0,0 +1,40 @@
[abi_symbol_list]
devm_gpiod_get_from_of_node
devm_gpiod_unhinge
devm_kstrdup_const
devm_mfd_add_devices
down_timeout
filp_close
filp_open
find_vpid
input_mt_destroy_slots
led_trigger_blink_oneshot
nr_irqs
pid_task
rdev_get_id
regcache_drop_region
regmap_async_complete
regmap_multi_reg_write
regmap_multi_reg_write
regmap_multi_reg_write_bypassed
regmap_raw_write
regmap_raw_write_async
regulator_bulk_enable
regulator_disable_regmap
regulator_enable_regmap
regulator_get_voltage_sel_regmap
regulator_is_enabled_regmap
regulator_map_voltage_linear
regulator_set_voltage_sel_regmap
request_any_context_irq
snd_compr_stop_error
snd_pcm_format_physical_width
snd_soc_component_disable_pin
snd_soc_component_force_enable_pin
snd_soc_component_set_sysclk
snd_soc_get_volsw_range
snd_soc_info_volsw_range
snd_soc_put_volsw_range
spi_bus_type
strncat
thermal_zone_device_unregister

1
build.config.gki.aarch64
View file

@ -15,6 +15,7 @@ android/abi_gki_aarch64_hikey960
android/abi_gki_aarch64_oneplus
android/abi_gki_aarch64_oplus
android/abi_gki_aarch64_qcom
android/abi_gki_aarch64_sony
android/abi_gki_aarch64_sunxi
android/abi_gki_aarch64_unisoc
android/abi_gki_aarch64_vivo

20
include/trace/hooks/sched.h
View file

@ -10,7 +10,6 @@
* Following tracepoints are not exported in tracefs and provide a
* mechanism for vendor modules to hook and extend functionality
*/
#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
struct task_struct;
DECLARE_RESTRICTED_HOOK(android_rvh_select_task_rq_fair,
TP_PROTO(struct task_struct *p, int prev_cpu, int sd_flag, int wake_flags, int *new_cpu),
@ -70,22 +69,9 @@ struct sched_group;
DECLARE_RESTRICTED_HOOK(android_rvh_find_busiest_group,
TP_PROTO(struct sched_group *busiest, struct rq *dst_rq, int *out_balance),
TP_ARGS(busiest, dst_rq, out_balance), 1);
#else
#define trace_android_rvh_select_task_rq_fair(p, prev_cpu, sd_flag, wake_flags, new_cpu)
#define trace_android_rvh_select_task_rq_rt(p, prev_cpu, sd_flag, wake_flags, new_cpu)
#define trace_android_rvh_select_fallback_rq(cpu, p, dest_cpu)
#define trace_android_vh_scheduler_tick(rq)
#define trace_android_rvh_enqueue_task(rq, p)
#define trace_android_rvh_dequeue_task(rq, p)
#define trace_android_rvh_can_migrate_task(p, dst_cpu, can_migrate)
#define trace_android_rvh_find_lowest_rq(p, local_cpu_mask, lowest_cpu)
#define trace_android_rvh_prepare_prio_fork(p)
#define trace_android_rvh_finish_prio_fork(p)
#define trace_android_rvh_rtmutex_prepare_setprio(p, pi_task)
#define trace_android_rvh_set_user_nice(p, nice)
#define trace_android_rvh_setscheduler(p)
#define trace_android_rvh_find_busiest_group(busiest, dst_rq, out_balance)
#endif
/* macro versions of hooks are no longer required */
#endif /* _TRACE_HOOK_SCHED_H */
/* This part must be outside protection */
#include <trace/define_trace.h>

9
include/trace/hooks/vendor_hooks.h
View file

@ -9,6 +9,8 @@
#include <linux/tracepoint.h>
#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
#define DECLARE_HOOK DECLARE_TRACE
#ifdef TRACE_HEADER_MULTI_READ
@ -74,3 +76,10 @@
PARAMS(__data, args))
#endif /* TRACE_HEADER_MULTI_READ */
#else /* !CONFIG_TRACEPOINTS || !CONFIG_ANDROID_VENDOR_HOOKS */
/* suppress trace hooks */
#define DECLARE_HOOK DECLARE_EVENT_NOP
#define DECLARE_RESTRICTED_HOOK(name, proto, args, cond) \
DECLARE_EVENT_NOP(name, PARAMS(proto), PARAMS(args))
#endif

6
mm/mprotect.c
View file

@ -43,6 +43,8 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
spinlock_t *ptl;
unsigned long pages = 0;
int target_node = NUMA_NO_NODE;
bool anon_writable =
vma_is_anonymous(vma) && (vma->vm_flags & VM_WRITE);
/*
* Can be called with only the mmap_sem for reading by
@ -119,7 +121,11 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
(pte_soft_dirty(ptent) ||
!(vma->vm_flags & VM_SOFTDIRTY))) {
ptent = pte_mkwrite(ptent);
} else if (anon_writable &&
page_mapcount(pte_page(ptent)) == 1) {
ptent = pte_mkwrite(ptent);
}
ptep_modify_prot_commit(vma, addr, pte, oldpte, ptent);
pages++;
} else if (IS_ENABLED(CONFIG_MIGRATION)) {