From 4c3b017c545f7c4d1242e16b48ae4bf84e378e97 Mon Sep 17 00:00:00 2001 From: Tom Gall Date: Tue, 26 Mar 2019 10:13:26 -0500 Subject: Fix merge issue with 4.4.177 Change global_attr to kobj_attribute to keep up with change in symbol name (drivers/cpufreq/cpufreq_governor.h) that came in via LTS. Signed-off-by: Tom Gall Link: https://github.com/tom-gall/hikey-linaro/commit/5ea186d035e346383f18ce189214b315d60f1316 Change-Id: I672f2a8016038790d134b45437571a4d68d73f42 Signed-off-by: Alistair Strachan (cherry picked from commit abe4979abd879af2f4d82e8c0bd46ded3a5ea1dd) --- drivers/cpufreq/cpufreq_interactive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index e0a586895136..55b3c58931a7 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -1041,7 +1041,7 @@ show_store_gov_pol_sys(boostpulse_duration); show_store_gov_pol_sys(io_is_busy); #define gov_sys_attr_rw(_name) \ -static struct global_attr _name##_gov_sys = \ +static struct kobj_attribute _name##_gov_sys = \ __ATTR(_name, 0644, show_##_name##_gov_sys, store_##_name##_gov_sys) #define gov_pol_attr_rw(_name) \ @@ -1063,7 +1063,7 @@ gov_sys_pol_attr_rw(boost); gov_sys_pol_attr_rw(boostpulse_duration); gov_sys_pol_attr_rw(io_is_busy); -static struct global_attr boostpulse_gov_sys = +static struct kobj_attribute boostpulse_gov_sys = __ATTR(boostpulse, 0200, NULL, store_boostpulse_gov_sys); static struct freq_attr boostpulse_gov_pol = -- cgit v1.2.3