Commit b770d024 authored by jan.koester's avatar jan.koester
Browse files

fxed intel uncore build

parent a0adf6b4

drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c

+9 −7
Original line number Diff line number Diff line
@@ -186,17 +186,17 @@ static int create_attr_group(struct uncore_data *data, char *name) 


	if (data->domain_id != UNCORE_DOMAIN_ID_INVALID) {

		init_attribute_root_ro(domain_id);

		data->uncore_attrs[index++] = &data->domain_id_dev_attr.attr;

		data->uncore_attrs[index++] = &data->domain_id_kobj_attr.attr;

		init_attribute_root_ro(fabric_cluster_id);

		data->uncore_attrs[index++] = &data->fabric_cluster_id_dev_attr.attr;

		data->uncore_attrs[index++] = &data->fabric_cluster_id_kobj_attr.attr;

		init_attribute_root_ro(package_id);

		data->uncore_attrs[index++] = &data->package_id_dev_attr.attr;

		data->uncore_attrs[index++] = &data->package_id_kobj_attr.attr;

	}



	data->uncore_attrs[index++] = &data->max_freq_khz_dev_attr.attr;

	data->uncore_attrs[index++] = &data->min_freq_khz_dev_attr.attr;

	data->uncore_attrs[index++] = &data->initial_min_freq_khz_dev_attr.attr;

	data->uncore_attrs[index++] = &data->initial_max_freq_khz_dev_attr.attr;

	data->uncore_attrs[index++] = &data->max_freq_khz_kobj_attr.attr;

	data->uncore_attrs[index++] = &data->min_freq_khz_kobj_attr.attr;

	data->uncore_attrs[index++] = &data->initial_min_freq_khz_kobj_attr.attr;

	data->uncore_attrs[index++] = &data->initial_max_freq_khz_kobj_attr.attr;

	data->uncore_attrs[index++] = &data->current_freq_khz_dev_attr.attr;

	data->uncore_attrs[index] = NULL;
@@ -204,6 +204,8 @@ static int create_attr_group(struct uncore_data *data, char *name) 
	data->uncore_attr_group.attrs = data->uncore_attrs;

	ret = sysfs_create_group(uncore_root_kobj, &data->uncore_attr_group);



	if (!ret)

		data->uncore_attrs[index++] = &data->current_freq_khz_kobj_attr.attr;

	return ret;

}

drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c.rej

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
--- drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c

+++ drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c

@@ -186,21 +186,21 @@ static int create_attr_group(struct uncore_data *data, char *name)

 

 	if (data->domain_id != UNCORE_DOMAIN_ID_INVALID) {

 		init_attribute_root_ro(domain_id);

-		data->uncore_attrs[index++] = &data->domain_id_dev_attr.attr;

+		data->uncore_attrs[index++] = &data->domain_id_kobj_attr.attr;

 		init_attribute_root_ro(fabric_cluster_id);

-		data->uncore_attrs[index++] = &data->fabric_cluster_id_dev_attr.attr;

+		data->uncore_attrs[index++] = &data->fabric_cluster_id_kobj_attr.attr;

 		init_attribute_root_ro(package_id);

-		data->uncore_attrs[index++] = &data->package_id_dev_attr.attr;

+		data->uncore_attrs[index++] = &data->package_id_kobj_attr.attr;

 	}

 

-	data->uncore_attrs[index++] = &data->max_freq_khz_dev_attr.attr;

-	data->uncore_attrs[index++] = &data->min_freq_khz_dev_attr.attr;

-	data->uncore_attrs[index++] = &data->initial_min_freq_khz_dev_attr.attr;

-	data->uncore_attrs[index++] = &data->initial_max_freq_khz_dev_attr.attr;

+	data->uncore_attrs[index++] = &data->max_freq_khz_kobj_attr.attr;

+	data->uncore_attrs[index++] = &data->min_freq_khz_kobj_attr.attr;

+	data->uncore_attrs[index++] = &data->initial_min_freq_khz_kobj_attr.attr;

+	data->uncore_attrs[index++] = &data->initial_max_freq_khz_kobj_attr.attr;

 

 	ret = uncore_read_freq(data, &freq);

 	if (!ret)

-		data->uncore_attrs[index++] = &data->current_freq_khz_dev_attr.attr;

+		data->uncore_attrs[index++] = &data->current_freq_khz_kobj_attr.attr;

 

 	data->uncore_attrs[index] = NULL;