[Update] [PATCH v6 3/3] PM: Introduce Intel PowerClamp Driver

[Update] [PATCH v6 3/3] PM: Introduce Intel PowerClamp Driver

[Jacob Pan]

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>

---
Need to include the proper nmi.h file such that
local_touch_nmi is always declared.


 drivers/thermal/intel_powerclamp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
index 314b6fc..81ebf87 100644
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@ -50,8 +50,8 @@
 #include <linux/tick.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
-#include <linux/nmi.h>
 
+#include <asm/nmi.h>
 #include <asm/msr.h>
 #include <asm/mwait.h>
 #include <asm/cpu_device_id.h>
-- 
1.7.9.5

Re: [Update] [PATCH v6 3/3] PM: Introduce Intel PowerClamp Driver

[Rafael J. Wysocki]

Hi,

Please send a new version of the original patch [3/3] including this fix.

There's no need to resend patches [1-2/3], though.

Thanks,
Rafael


On 1/16/2013 10:45 AM, Jacob Pan wrote:
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
>
> ---
> Need to include the proper nmi.h file such that
> local_touch_nmi is always declared.
>
>
>   drivers/thermal/intel_powerclamp.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
> index 314b6fc..81ebf87 100644
> --- a/drivers/thermal/intel_powerclamp.c
> +++ b/drivers/thermal/intel_powerclamp.c
> @@ -50,8 +50,8 @@
>   #include <linux/tick.h>
>   #include <linux/debugfs.h>
>   #include <linux/seq_file.h>
> -#include <linux/nmi.h>
>   
> +#include <asm/nmi.h>
>   #include <asm/msr.h>
>   #include <asm/mwait.h>
>   #include <asm/cpu_device_id.h>

---------------------------------------------------------------------
Intel Technology Poland sp. z o.o.
z siedziba w Gdansku
ul. Slowackiego 173
80-298 Gdansk

Sad Rejonowy Gdansk Polnoc w Gdansku, 
VII Wydzial Gospodarczy Krajowego Rejestru Sadowego, 
numer KRS 101882

NIP 957-07-52-316
Kapital zakladowy 200.000 zl

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.