Merge branches 'acpi-init', 'acpi-osl', 'acpi-bus', 'acpi-tables' and 'acpi-misc'
* acpi-init: ACPI: probe ECDT before loading AML tables regardless of module-level code flag * acpi-osl: ACPI / OSL: Use 'jiffies' as the time bassis for acpi_os_get_timer() * acpi-bus: ACPI / glue: Split dev_is_platform() out of module for wide use * acpi-tables: ACPI/PPTT: Handle architecturally unknown cache types drivers: base: cacheinfo: Do not populate sysfs for unknown cache types * acpi-misc: ACPI: remove redundant 'default n' from Kconfig ACPI: custom_method: remove meaningless null check before debugfs_remove()
This commit is contained in:
@@ -615,6 +615,8 @@ static int cache_add_dev(unsigned int cpu)
|
||||
this_leaf = this_cpu_ci->info_list + i;
|
||||
if (this_leaf->disable_sysfs)
|
||||
continue;
|
||||
if (this_leaf->type == CACHE_TYPE_NOCACHE)
|
||||
break;
|
||||
cache_groups = cache_get_attribute_groups(this_leaf);
|
||||
ci_dev = cpu_device_create(parent, this_leaf, cache_groups,
|
||||
"index%1u", i);
|
||||
|
Reference in New Issue
Block a user