From: Yu, Ong Hock Date: Thu, 23 Jun 2016 06:59:58 +0000 (+0800) Subject: intel_telemetry: Remove Monitor MWAIT feature dependency X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=08a245160bce8b3d044fa0fdac9ca099bd720706;p=deliverable%2Flinux.git intel_telemetry: Remove Monitor MWAIT feature dependency Telemetry capability does not depend on Monitor MWAIT feature. Signed-off-by: "Yu, Ong Hock" Acked-by: Souvik Kumar Chakravarty Signed-off-by: Darren Hart --- diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c index f5134acd6ff0..d76ee59f5090 100644 --- a/drivers/platform/x86/intel_telemetry_debugfs.c +++ b/drivers/platform/x86/intel_telemetry_debugfs.c @@ -78,7 +78,7 @@ #define TELEM_EVT_LEN(x) (sizeof(x)/sizeof((x)[0])) #define TELEM_DEBUGFS_CPU(model, data) \ - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (unsigned long)&data} + { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&data} #define TELEM_CHECK_AND_PARSE_EVTS(EVTID, EVTNUM, BUF, EVTLOG, EVTDAT, MASK) { \ if (evtlog[index].telem_evtid == (EVTID)) { \ diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel_telemetry_pltdrv.c index 09c84a2b1c2c..e62cee97d65a 100644 --- a/drivers/platform/x86/intel_telemetry_pltdrv.c +++ b/drivers/platform/x86/intel_telemetry_pltdrv.c @@ -82,7 +82,7 @@ #define TELEM_SET_VERBOSITY_BITS(x, y) ((x) |= ((y) << 27)) #define TELEM_CPU(model, data) \ - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (unsigned long)&data } + { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&data } enum telemetry_action { TELEM_UPDATE = 0,