Merge branch 'android12-5.10' into android12-5.10-lts

Sync up with android12-5.10 for the following commits:

bd50b5dc98 ANDROID: GKI: update allowed GKI symbol for Exynosauto SoC
d67fe0a88e ANDROID: GKI: sync allowed list for exynosauto SoC
7a686fd9a5 ANDROID: ABI: update allowed list for galaxy
3f153f7642 ANDROID: Update symbol list for mtk
81c8161bed ANDROID: vendor_hooks: Add hooks to tcp/udp send/recv msg functions.
76879a1964 ANDROID: fs: pipe: wakeup readers on small writes even if pipe had data
989fb724d5 ANDROID: GKI: sort the list of symbol lists
6d737c9d03 Revert "ANDROID: ABI: update symbols to unisoc whitelist for the fifth time"
4d9d100eea ANDROID: Update the exynos symbol list
c2af3663a8 ANDROID: GKI: Add some symbols to symbol list
24ceda42e2 ANDROID: abi_gki_aarch64_qcom: Add additional symbols for show_cpufinfo_max_freq
f3e3a45d2b ANDROID: sched: add restricted hook to override show_cpufinfo_max_freq
e30728e4ff ANDROID: ABI: initial update allowed list for galaxy
13fe7b9964 ANDROID: abi_gki_aarch64_qcom: Add I3C interface symbols to qcom tree
1321fef6b8 ANDROID: Update symbol list for mtk
0050b3de97 ANDROID:  abi_gki_aarch64_qcom: Add additional symbols for after hooks
583eba64fe FROMGIT: usb: gadget: composite: Allow bMaxPower=0 if self-powered
e33cf9dd43 FROMGIT: f2fs: let's keep writing IOs on SBI_NEED_FSCK

Change-Id: I046d733f093bf8810e21b4153f9bc6ca3d78cf4e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2021-07-28 14:43:46 +02:00
19 changed files with 5551 additions and 2788 deletions

View File

@@ -697,6 +697,7 @@ static ssize_t show_cpuinfo_max_freq(struct cpufreq_policy *policy, char *buf)
unsigned int max_freq = policy->cpuinfo.max_freq;
trace_android_vh_show_max_freq(policy, &max_freq);
trace_android_rvh_show_max_freq(policy, &max_freq);
return sprintf(buf, "%u\n", max_freq);
}