提交 212bebb4 编写于 作者: D Deepthi Dharwar 提交者: Benjamin Herrenschmidt

pseries: Move plpar_wrapper.h to powerpc common include/asm location.

As a part of pseries_idle backend driver cleanup to make
the code common to both pseries and powernv platforms, it
is necessary to move the backend-driver code to drivers/cpuidle.

As a pre-requisite for that, it is essential to move plpar_wrapper.h
to include/asm.
Signed-off-by: NDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
上级 9b3fbd6c
#ifndef _PSERIES_PLPAR_WRAPPERS_H #ifndef _ASM_POWERPC_PLPAR_WRAPPERS_H
#define _PSERIES_PLPAR_WRAPPERS_H #define _ASM_POWERPC_PLPAR_WRAPPERS_H
#include <linux/string.h> #include <linux/string.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
...@@ -297,4 +297,4 @@ static inline long plapr_set_watchpoint0(unsigned long dawr0, unsigned long dawr ...@@ -297,4 +297,4 @@ static inline long plapr_set_watchpoint0(unsigned long dawr0, unsigned long dawr
return plpar_set_mode(0, 2, dawr0, dawrx0); return plpar_set_mode(0, 2, dawr0, dawrx0);
} }
#endif /* _PSERIES_PLPAR_WRAPPERS_H */ #endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/memory.h> #include <linux/memory.h>
#include <asm/plpar_wrappers.h>
#include "plpar_wrappers.h"
#define CMM_DRIVER_VERSION "1.0.0" #define CMM_DRIVER_VERSION "1.0.0"
#define CMM_DEFAULT_DELAY 1 #define CMM_DEFAULT_DELAY 1
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/debug.h> #include <asm/debug.h>
#include <asm/plpar_wrappers.h>
#include "plpar_wrappers.h"
struct dtl { struct dtl {
struct dtl_entry *buf; struct dtl_entry *buf;
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/vdso_datapage.h> #include <asm/vdso_datapage.h>
#include <asm/xics.h> #include <asm/xics.h>
#include "plpar_wrappers.h" #include <asm/plpar_wrappers.h>
#include "offline_states.h" #include "offline_states.h"
/* This version can't take the spinlock, because it never returns */ /* This version can't take the spinlock, because it never returns */
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/hvconsole.h> #include <asm/hvconsole.h>
#include "plpar_wrappers.h" #include <asm/plpar_wrappers.h>
/** /**
* hvc_get_chars - retrieve characters from firmware for denoted vterm adatper * hvc_get_chars - retrieve characters from firmware for denoted vterm adatper
......
...@@ -48,8 +48,7 @@ ...@@ -48,8 +48,7 @@
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
#include <asm/udbg.h> #include <asm/udbg.h>
#include <asm/mmzone.h> #include <asm/mmzone.h>
#include <asm/plpar_wrappers.h>
#include "plpar_wrappers.h"
static void tce_invalidate_pSeries_sw(struct iommu_table *tbl, static void tce_invalidate_pSeries_sw(struct iommu_table *tbl,
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include <asm/mpic.h> #include <asm/mpic.h>
#include <asm/xics.h> #include <asm/xics.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/plpar_wrappers.h>
#include "pseries.h" #include "pseries.h"
#include "plpar_wrappers.h"
static void pseries_kexec_cpu_down(int crash_shutdown, int secondary) static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
{ {
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/trace.h> #include <asm/trace.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/plpar_wrappers.h>
#include "plpar_wrappers.h"
#include "pseries.h" #include "pseries.h"
/* Flag bits for H_BULK_REMOVE */ /* Flag bits for H_BULK_REMOVE */
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/runlatch.h> #include <asm/runlatch.h>
#include <asm/plpar_wrappers.h>
#include "plpar_wrappers.h"
struct cpuidle_driver pseries_idle_driver = { struct cpuidle_driver pseries_idle_driver = {
.name = "pseries_idle", .name = "pseries_idle",
......
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/eeh.h> #include <asm/eeh.h>
#include <asm/reg.h> #include <asm/reg.h>
#include <asm/plpar_wrappers.h>
#include "plpar_wrappers.h"
#include "pseries.h" #include "pseries.h"
int CMO_PrPSP = -1; int CMO_PrPSP = -1;
......
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
#include <asm/cputhreads.h> #include <asm/cputhreads.h>
#include <asm/xics.h> #include <asm/xics.h>
#include <asm/dbell.h> #include <asm/dbell.h>
#include <asm/plpar_wrappers.h>
#include "plpar_wrappers.h"
#include "pseries.h" #include "pseries.h"
#include "offline_states.h" #include "offline_states.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册