Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This is the 4.19.157 stable release

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl+q9C8ACgkQONu9yGCS
 aT5fXg//esuOB/pmYAHq0ko6XXOhHlmydkIKuLy/RjO6j2KjO0QDBeyj/YodCWC0
 mSRk2Rf3vu9UX/VeLGPigDym4PgnOTNh/9y4BB2IAtJXiEbAGM/P9ewthCGLBnkr
 cDWQSqhxsAnFokvNCU2kAtsvkdt3M7Lt1AhaqcMSktjA8F8MxW80YOg8wlbqRStw
 C97i+tLqVTwfSa6gliCsx6Z0ss7y9k+WNHx+Vv6ZwzRr020WpF1lxZ8LeACR0wCV
 44bgP9m+JNzacd8k0dJSunN5u/S0dPo2PzvNJXR2R89YV1rWRfqQT5LIPyKKNH0f
 hNcxK67kV6MzyP/LjUAZd+pPF3+GhfV9u0JEDVSSD8nwkCCbfXabMJqqZneXaAft
 +/LOvJjSxJB79gdNjicW83HXtLPpnT8C2Ypf8WKNehx29Y86aCHfCcZ2rdkqkjs3
 ag4nBXKB242VtE9E9JjfBQbVI1eO0naWnVDgQI9PVHfvjj/fl4eYexsrjjNmy8Dl
 JDIP88BHNTtV+flprTG2aqW3dFAASPUTt40k6dvcY0hKwipT7er3FkMa30txO1SU
 5FFHMI9RndavDEq8qBk/vqNiuE2FHZ8334iFTPo3/f6TO8LyABrSWOAUu0Gzx1Ez
 BplEpG/oBrHoWtaR/hWK1mBRiYALYHjrgRPnwJIjz0E4IqFejro=
 =PJdP
 -----END PGP SIGNATURE-----

Merge 4.19.157 into android-4.19-stable

Changes in 4.19.157
	powercap: restrict energy meter to root access
	Linux 4.19.157

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie418582e2db8a7f2f1eb4f1034fe530e0132afe3
This commit is contained in:
Greg Kroah-Hartman 2020-11-11 11:16:11 +01:00
commit 8ee67bc843
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 4 VERSION = 4
PATCHLEVEL = 19 PATCHLEVEL = 19
SUBLEVEL = 156 SUBLEVEL = 157
EXTRAVERSION = EXTRAVERSION =
NAME = "People's Front" NAME = "People's Front"

4
drivers/powercap/powercap_sys.c
View file

@ -379,9 +379,9 @@ static void create_power_zone_common_attributes(
&dev_attr_max_energy_range_uj.attr; &dev_attr_max_energy_range_uj.attr;
if (power_zone->ops->get_energy_uj) { if (power_zone->ops->get_energy_uj) {
if (power_zone->ops->reset_energy_uj) if (power_zone->ops->reset_energy_uj)
dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO; dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
else else
dev_attr_energy_uj.attr.mode = S_IRUGO; dev_attr_energy_uj.attr.mode = S_IRUSR;
power_zone->zone_dev_attrs[count++] = power_zone->zone_dev_attrs[count++] =
&dev_attr_energy_uj.attr; &dev_attr_energy_uj.attr;
} }