Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3c15c3cd authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.243 kernel 

Changes in 4.4.243: (2 commits)
        powercap: restrict energy meter to root access
        Linux 4.4.243
parents 009678fa 04d24799

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 242

SUBLEVEL = 243

EXTRAVERSION =

NAME = Blurry Fish Butt

drivers/powercap/powercap_sys.c

+2 −2
Original line number Diff line number Diff line
@@ -379,9 +379,9 @@ static void create_power_zone_common_attributes( 
					&dev_attr_max_energy_range_uj.attr;

	if (power_zone->ops->get_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

			dev_attr_energy_uj.attr.mode = S_IRUGO;

			dev_attr_energy_uj.attr.mode = S_IRUSR;

		power_zone->zone_dev_attrs[count++] =

					&dev_attr_energy_uj.attr;

	}