diff options
| author | Tom Zanussi <zanussi@kernel.org> | 2019-07-22 08:03:36 -0500 |
|---|---|---|
| committer | Tom Zanussi <zanussi@kernel.org> | 2019-07-22 08:03:36 -0500 |
| commit | 51e862a1c3818fb40d94586a4a779aef80b4787a (patch) | |
| tree | db9bdc1acaeff5877d545fdf29e2308182673bad /drivers/base | |
| parent | e23591938e23b84abf0fc3e348fa3eee4934965e (diff) | |
| parent | ff33472c282e209da54cbc0c7c1c06ddfcc93d33 (diff) | |
| download | linux-rt-51e862a1c3818fb40d94586a4a779aef80b4787a.tar.gz | |
Merge tag 'v4.14.134' into v4.14-rt-work
This is the 4.14.134 stable release
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/cacheinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index 07532d83be0b..e405ea3ca8d8 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -669,7 +669,8 @@ static int cacheinfo_cpu_pre_down(unsigned int cpu) static int __init cacheinfo_sysfs_init(void) { - return cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "base/cacheinfo:online", + return cpuhp_setup_state(CPUHP_AP_BASE_CACHEINFO_ONLINE, + "base/cacheinfo:online", cacheinfo_cpu_online, cacheinfo_cpu_pre_down); } device_initcall(cacheinfo_sysfs_init); |