On Wed, Jul 24, 2019 at 12:35:42PM -0700, Sean Christopherson wrote: > > + if (IS_ENABLED(CONFIG_INTEL_SGX) && cpu_has(c, X86_FEATURE_SGX)) > > + detect_sgx(c); > > + > > + init_intel_energy_perf(c); > > All of the energy_perf additions are bogus, looks like a rebase gone wrong. Fixed in the master. /Jarkko
