Unverified Commit 595c4b67 authored by Ilpo Järvinen's avatar Ilpo Järvinen
Browse files

Merge branch 'intel-sst' of https://github.com/spandruvada/linux-kernel into review-ilpo-next

parents 98e45f0d 600c8f24

tools/power/x86/intel-speed-select/isst-config.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct process_cmd_struct { 
	int arg;

};



static const char *version_str = "v1.20";

static const char *version_str = "v1.21";



static const int supported_api_ver = 3;

static struct isst_if_platform_info isst_platform_info;

tools/power/x86/intel-speed-select/isst-core-tpmi.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static int tpmi_get_get_trls(struct isst_id *id, int config_index, 
	return 0;

}



static int tpmi_get_get_trl(struct isst_id *id, int level, int config_index,

static int tpmi_get_get_trl(struct isst_id *id, int config_index, int level,

			    int *trl)

{

	struct isst_pkg_ctdp_level_info ctdp_level;