On Sunday 25 January 2015 19:02:14 Greg KH wrote: > On Mon, Dec 22, 2014 at 03:50:56PM +0100, Pali Rohár wrote: > > From: Jacob Pan <[email protected]> > > > > commit a97ac35b5d9e948ccfcbc04c69e9d2c94e788e94 > > > > Add support for Broadwell model 0x3d and Haswell model > > (0x3c). > > > > Signed-off-by: Jacob Pan <[email protected]> > > Signed-off-by: Rafael J. Wysocki > > <[email protected]> > > > > diff --git a/drivers/powercap/intel_rapl.c > > b/drivers/powercap/intel_rapl.c index 1c987d2..b1cda6f > > 100644 > > --- a/drivers/powercap/intel_rapl.c > > +++ b/drivers/powercap/intel_rapl.c > > @@ -951,7 +951,9 @@ static const struct x86_cpu_id > > rapl_ids[] = { > > > > { X86_VENDOR_INTEL, 6, 0x2d},/* Sandy Bridge EP */ > > { X86_VENDOR_INTEL, 6, 0x37},/* Valleyview */ > > { X86_VENDOR_INTEL, 6, 0x3a},/* Ivy Bridge */ > > > > - { X86_VENDOR_INTEL, 6, 0x45},/* Haswell */ > > + { X86_VENDOR_INTEL, 6, 0x3c},/* Haswell */ > > + { X86_VENDOR_INTEL, 6, 0x3d},/* Broadwell */ > > + { X86_VENDOR_INTEL, 6, 0x45},/* Haswell ULT */ > > > > /* TODO: Add more CPU IDs after testing */ > > {} > > > > }; > > What are you asking for this to be applied to? It doesn't > work on anything that I can determine :( > > greg k-h
Now I see there is problem... There were some cosmetic patches which changed comments, which cause that you cannot apply this patch. d6b2e6d09aa18738dd29277617a186fa827bd7e1 ed93b71492da3464b4798613aa8a99bed914251b -- Pali Rohár [email protected]
signature.asc
Description: This is a digitally signed message part.
