diff options
| author | Michael Ellerman | 2016-11-15 04:47:42 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2016-11-18 13:02:17 +0100 |
| commit | 139ac5afe30bcad3e0a8064a2fac608f015aa166 (patch) | |
| tree | d0e3782214df0d453598fbcb68bd8cd6d43dee3d /arch | |
| parent | cxl: Fix coredump generation when cxl_get_fd() is used (diff) | |
| download | kernel-qcow2-linux-139ac5afe30bcad3e0a8064a2fac608f015aa166.tar.gz kernel-qcow2-linux-139ac5afe30bcad3e0a8064a2fac608f015aa166.tar.xz kernel-qcow2-linux-139ac5afe30bcad3e0a8064a2fac608f015aa166.zip | |
powerpc/pseries: Move vio.c into platforms pseries
vio.c is pseries only code, so move it in there.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/Kconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/Kconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/vio.c (renamed from arch/powerpc/kernel/vio.c) | 0 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 1925341dbb9c..9c57ebf61e4d 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -58,7 +58,6 @@ obj-$(CONFIG_PPC_RTAS) += rtas.o rtas-rtc.o $(rtaspci-y-y) obj-$(CONFIG_PPC_RTAS_DAEMON) += rtasd.o obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o obj-$(CONFIG_RTAS_PROC) += rtas-proc.o -obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_IBMEBUS) += ibmebus.o obj-$(CONFIG_EEH) += eeh.o eeh_pe.o eeh_dev.o eeh_cache.o \ eeh_driver.o eeh_event.o eeh_sysfs.o diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index fbdae8377b71..eae86c35e4c6 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -168,11 +168,6 @@ config MPIC_BROKEN_REGREAD well, but enabling it uses about 8KB of memory to keep copies of the register contents in software. -config IBMVIO - depends on PPC_PSERIES - bool - default y - config IBMEBUS depends on PPC_PSERIES bool "Support for GX bus based adapters" diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index bec90fb30425..f7d78b81951d 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -127,3 +127,8 @@ config HV_PERF_CTRS systems. 24x7 is available on Power 8 systems. If unsure, select Y. + +config IBMVIO + depends on PPC_PSERIES + bool + default y diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index fedc2ccf029d..85ba00233fb0 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_CMM) += cmm.o obj-$(CONFIG_DTL) += dtl.o obj-$(CONFIG_IO_EVENT_IRQ) += io_event_irq.o obj-$(CONFIG_LPARCFG) += lparcfg.o +obj-$(CONFIG_IBMVIO) += vio.o ifeq ($(CONFIG_PPC_PSERIES),y) obj-$(CONFIG_SUSPEND) += suspend.o diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/platforms/pseries/vio.c index 2c8fb3ec989e..2c8fb3ec989e 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/platforms/pseries/vio.c |