Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Deepthi Dharwar <deepthi@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Deepthi Dharwar and committed by
Benjamin Herrenschmidt
212bebb4 9b3fbd6c

+14 -17
+1 -2
arch/powerpc/platforms/pseries/cmm.c
··· 40 40 #include <asm/pgalloc.h> 41 41 #include <asm/uaccess.h> 42 42 #include <linux/memory.h> 43 - 44 - #include "plpar_wrappers.h" 43 + #include <asm/plpar_wrappers.h> 45 44 46 45 #define CMM_DRIVER_VERSION "1.0.0" 47 46 #define CMM_DEFAULT_DELAY 1
+1 -2
arch/powerpc/platforms/pseries/dtl.c
··· 29 29 #include <asm/firmware.h> 30 30 #include <asm/lppaca.h> 31 31 #include <asm/debug.h> 32 - 33 - #include "plpar_wrappers.h" 32 + #include <asm/plpar_wrappers.h> 34 33 35 34 struct dtl { 36 35 struct dtl_entry *buf;
+2 -1
arch/powerpc/platforms/pseries/hotplug-cpu.c
··· 30 30 #include <asm/machdep.h> 31 31 #include <asm/vdso_datapage.h> 32 32 #include <asm/xics.h> 33 - #include "plpar_wrappers.h" 33 + #include <asm/plpar_wrappers.h> 34 + 34 35 #include "offline_states.h" 35 36 36 37 /* This version can't take the spinlock, because it never returns */
+1 -1
arch/powerpc/platforms/pseries/hvconsole.c
··· 28 28 #include <linux/errno.h> 29 29 #include <asm/hvcall.h> 30 30 #include <asm/hvconsole.h> 31 - #include "plpar_wrappers.h" 31 + #include <asm/plpar_wrappers.h> 32 32 33 33 /** 34 34 * hvc_get_chars - retrieve characters from firmware for denoted vterm adatper
+1 -2
arch/powerpc/platforms/pseries/iommu.c
··· 48 48 #include <asm/ppc-pci.h> 49 49 #include <asm/udbg.h> 50 50 #include <asm/mmzone.h> 51 - 52 - #include "plpar_wrappers.h" 51 + #include <asm/plpar_wrappers.h> 53 52 54 53 55 54 static void tce_invalidate_pSeries_sw(struct iommu_table *tbl,
+1 -1
arch/powerpc/platforms/pseries/kexec.c
··· 17 17 #include <asm/mpic.h> 18 18 #include <asm/xics.h> 19 19 #include <asm/smp.h> 20 + #include <asm/plpar_wrappers.h> 20 21 21 22 #include "pseries.h" 22 - #include "plpar_wrappers.h" 23 23 24 24 static void pseries_kexec_cpu_down(int crash_shutdown, int secondary) 25 25 {
+1 -1
arch/powerpc/platforms/pseries/lpar.c
··· 41 41 #include <asm/smp.h> 42 42 #include <asm/trace.h> 43 43 #include <asm/firmware.h> 44 + #include <asm/plpar_wrappers.h> 44 45 45 - #include "plpar_wrappers.h" 46 46 #include "pseries.h" 47 47 48 48 /* Flag bits for H_BULK_REMOVE */
+3 -3
arch/powerpc/platforms/pseries/plpar_wrappers.h arch/powerpc/include/asm/plpar_wrappers.h
··· 1 - #ifndef _PSERIES_PLPAR_WRAPPERS_H 2 - #define _PSERIES_PLPAR_WRAPPERS_H 1 + #ifndef _ASM_POWERPC_PLPAR_WRAPPERS_H 2 + #define _ASM_POWERPC_PLPAR_WRAPPERS_H 3 3 4 4 #include <linux/string.h> 5 5 #include <linux/irqflags.h> ··· 297 297 return plpar_set_mode(0, 2, dawr0, dawrx0); 298 298 } 299 299 300 - #endif /* _PSERIES_PLPAR_WRAPPERS_H */ 300 + #endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */
+1 -2
arch/powerpc/platforms/pseries/processor_idle.c
··· 18 18 #include <asm/machdep.h> 19 19 #include <asm/firmware.h> 20 20 #include <asm/runlatch.h> 21 - 22 - #include "plpar_wrappers.h" 21 + #include <asm/plpar_wrappers.h> 23 22 24 23 struct cpuidle_driver pseries_idle_driver = { 25 24 .name = "pseries_idle",
+1 -1
arch/powerpc/platforms/pseries/setup.c
··· 66 66 #include <asm/firmware.h> 67 67 #include <asm/eeh.h> 68 68 #include <asm/reg.h> 69 + #include <asm/plpar_wrappers.h> 69 70 70 - #include "plpar_wrappers.h" 71 71 #include "pseries.h" 72 72 73 73 int CMO_PrPSP = -1;
+1 -1
arch/powerpc/platforms/pseries/smp.c
··· 43 43 #include <asm/cputhreads.h> 44 44 #include <asm/xics.h> 45 45 #include <asm/dbell.h> 46 + #include <asm/plpar_wrappers.h> 46 47 47 - #include "plpar_wrappers.h" 48 48 #include "pseries.h" 49 49 #include "offline_states.h" 50 50