Skip to content

L
linux
Commit aaf8a7a2 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files
Options

Merge iSeries include file move

parents 104dd65f ecb3ca27
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 152 deletions
arch/powerpc/kernel/asm-offsets.c
View file @ aaf8a7a2
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
#include <asm/compat.h> #include <asm/compat.h>
......
arch/powerpc/kernel/head_64.S
View file @ aaf8a7a2
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/iSeries/LparMap.h> #include <asm/iseries/lpar_map.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
......
arch/powerpc/kernel/lparmap.c
View file @ aaf8a7a2
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
*/ */
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/iSeries/LparMap.h> #include <asm/iseries/lpar_map.h>
const struct LparMap __attribute__((__section__(".text"))) xLparMap = { const struct LparMap __attribute__((__section__(".text"))) xLparMap = {
.xNumberEsids = HvEsidsToMap, .xNumberEsids = HvEsidsToMap,
......
arch/powerpc/kernel/setup_64.c
View file @ aaf8a7a2
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/lmb.h> #include <asm/lmb.h>
#include <asm/iSeries/ItLpNaca.h> #include <asm/iseries/it_lp_naca.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
#include <asm/xmon.h> #include <asm/xmon.h>
......
arch/powerpc/kernel/time.c
View file @ aaf8a7a2
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
#include <asm/firmware.h> #include <asm/firmware.h>
#endif #endif
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
#include <asm/iSeries/ItLpQueue.h> #include <asm/iseries/it_lp_queue.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iseries/hv_call_xm.h>
#endif #endif
/* keep track of when we need to update the rtc */ /* keep track of when we need to update the rtc */
......
arch/powerpc/lib/locks.c
View file @ aaf8a7a2
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
/* waiting for a spinlock... */ /* waiting for a spinlock... */
#if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/iSeries/HvCall.h> #include <asm/iseries/hv_call.h>
void __spin_yield(raw_spinlock_t *lock) void __spin_yield(raw_spinlock_t *lock)
{ {
......
arch/powerpc/platforms/iseries/call_hpt.h
View file @ aaf8a7a2
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* drive the hypervisor from the OS. * drive the hypervisor from the OS.
*/ */
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#define HvCallHptGetHptAddress HvCallHpt + 0 #define HvCallHptGetHptAddress HvCallHpt + 0
......
arch/powerpc/platforms/iseries/call_pci.h
View file @ aaf8a7a2
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#ifndef _PLATFORMS_ISERIES_CALL_PCI_H #ifndef _PLATFORMS_ISERIES_CALL_PCI_H
#define _PLATFORMS_ISERIES_CALL_PCI_H #define _PLATFORMS_ISERIES_CALL_PCI_H
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
/* /*
* DSA == Direct Select Address * DSA == Direct Select Address
......
arch/powerpc/platforms/iseries/call_sm.h
View file @ aaf8a7a2
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* drive the hypervisor from the OS. * drive the hypervisor from the OS.
*/ */
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#define HvCallSmGet64BitsOfAccessMap HvCallSm + 11 #define HvCallSmGet64BitsOfAccessMap HvCallSm + 11
......
arch/powerpc/platforms/iseries/hvlog.c
View file @ aaf8a7a2
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/iSeries/HvCall.h> #include <asm/iseries/hv_call.h>
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
void HvCall_writeLogBuffer(const void *buffer, u64 len) void HvCall_writeLogBuffer(const void *buffer, u64 len)
......
arch/powerpc/platforms/iseries/hvlpconfig.c
View file @ aaf8a7a2
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
HvLpIndex HvLpConfig_getLpIndex_outline(void) HvLpIndex HvLpConfig_getLpIndex_outline(void)
{ {
......
arch/powerpc/platforms/iseries/iommu.c
View file @ aaf8a7a2
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iseries/hv_call_xm.h>
extern struct list_head iSeries_Global_Device_List; extern struct list_head iSeries_Global_Device_List;
......
arch/powerpc/platforms/iseries/irq.c
View file @ aaf8a7a2
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/ppcdebug.h> #include <asm/ppcdebug.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iseries/hv_call_xm.h>
#include "irq.h" #include "irq.h"
#include "call_pci.h" #include "call_pci.h"
......
arch/powerpc/platforms/iseries/ksyms.c
View file @ aaf8a7a2
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/hw_irq.h> #include <asm/hw_irq.h>
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
EXPORT_SYMBOL(HvCall0); EXPORT_SYMBOL(HvCall0);
EXPORT_SYMBOL(HvCall1); EXPORT_SYMBOL(HvCall1);
......
arch/powerpc/platforms/iseries/lpardata.c
View file @ aaf8a7a2
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/naca.h> #include <asm/naca.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/iSeries/ItLpNaca.h> #include <asm/iseries/it_lp_naca.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iSeries/ItLpRegSave.h> #include <asm/iseries/it_lp_reg_save.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/iSeries/LparMap.h> #include <asm/iseries/lpar_map.h>
#include <asm/iSeries/ItExtVpdPanel.h> #include <asm/iseries/it_exp_vpd_panel.h>
#include <asm/iSeries/ItLpQueue.h> #include <asm/iseries/it_lp_queue.h>
#include "vpd_areas.h" #include "vpd_areas.h"
#include "spcomm_area.h" #include "spcomm_area.h"
......
arch/powerpc/platforms/iseries/lpevents.c
View file @ aaf8a7a2
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/iSeries/ItLpQueue.h> #include <asm/iseries/it_lp_queue.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/HvCallEvent.h> #include <asm/iseries/hv_call_event.h>
#include <asm/iSeries/ItLpNaca.h> #include <asm/iseries/it_lp_naca.h>
/* /*
* The LpQueue is used to pass event data from the hypervisor to * The LpQueue is used to pass event data from the hypervisor to
......
arch/powerpc/platforms/iseries/mf.c
View file @ aaf8a7a2
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/iSeries/vio.h> #include <asm/iseries/vio.h>
#include <asm/iSeries/mf.h> #include <asm/iseries/mf.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/iSeries/ItLpQueue.h> #include <asm/iseries/it_lp_queue.h>
#include "setup.h" #include "setup.h"
......
arch/powerpc/platforms/iseries/pci.c
View file @ aaf8a7a2
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iseries/hv_call_xm.h>
#include <asm/iSeries/mf.h> #include <asm/iseries/mf.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
......
arch/powerpc/platforms/iseries/proc.c
View file @ aaf8a7a2
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iSeries/ItLpQueue.h> #include <asm/iseries/it_lp_queue.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iseries/hv_call_xm.h>
#include "processor_vpd.h" #include "processor_vpd.h"
#include "main_store.h" #include "main_store.h"
......
arch/powerpc/platforms/iseries/setup.c
View file @ aaf8a7a2
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/iSeries/HvCallEvent.h> #include <asm/iseries/hv_call_event.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iseries/hv_call_xm.h>
#include <asm/iSeries/ItLpQueue.h> #include <asm/iseries/it_lp_queue.h>
#include <asm/iSeries/mf.h> #include <asm/iseries/mf.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/LparMap.h> #include <asm/iseries/lpar_map.h>
#include "setup.h" #include "setup.h"
#include "irq.h" #include "irq.h"
......
arch/powerpc/platforms/iseries/smp.c
View file @ aaf8a7a2
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/iSeries/HvCall.h> #include <asm/iseries/hv_call.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/ppcdebug.h> #include <asm/ppcdebug.h>
#include <asm/machdep.h> #include <asm/machdep.h>
......
arch/powerpc/platforms/iseries/vio.c
View file @ aaf8a7a2
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
#include <asm/tce.h> #include <asm/tce.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/iSeries/vio.h> #include <asm/iseries/vio.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iseries/hv_call_xm.h>
struct device *iSeries_vio_dev = &vio_bus_device.dev; struct device *iSeries_vio_dev = &vio_bus_device.dev;
EXPORT_SYMBOL(iSeries_vio_dev); EXPORT_SYMBOL(iSeries_vio_dev);
......
arch/powerpc/platforms/iseries/viopath.c
View file @ aaf8a7a2
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/ItExtVpdPanel.h> #include <asm/iseries/it_exp_vpd_panel.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/iSeries/mf.h> #include <asm/iseries/mf.h>
#include <asm/iSeries/vio.h> #include <asm/iseries/vio.h>
/* Status of the path to each other partition in the system. /* Status of the path to each other partition in the system.
* This is overkill, since we will only ever establish connections * This is overkill, since we will only ever establish connections
......
arch/powerpc/platforms/iseries/vpdinfo.c
View file @ aaf8a7a2
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <asm/resource.h> #include <asm/resource.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include "pci.h" #include "pci.h"
#include "call_pci.h" #include "call_pci.h"
......
arch/ppc64/kernel/asm-offsets.c
View file @ aaf8a7a2
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/cache.h> #include <asm/cache.h>
......
arch/ppc64/kernel/head.S
View file @ aaf8a7a2
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/iSeries/LparMap.h> #include <asm/iseries/lpar_map.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
......
arch/ppc64/kernel/irq.c
View file @ aaf8a7a2
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/iSeries/ItLpQueue.h> #include <asm/iseries/it_lp_queue.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/paca.h> #include <asm/paca.h>
......
arch/ppc64/kernel/lparcfg.c
View file @ aaf8a7a2
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/iSeries/ItExtVpdPanel.h> #include <asm/iseries/it_exp_vpd_panel.h>
#include <asm/prom.h> #include <asm/prom.h>
#define MODULE_VERS "1.6" #define MODULE_VERS "1.6"
......
arch/ppc64/kernel/pacaData.c
View file @ aaf8a7a2
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iSeries/ItLpQueue.h> #include <asm/iseries/it_lp_queue.h>
#include <asm/paca.h> #include <asm/paca.h>
static union { static union {
......
drivers/block/viodasd.c
View file @ aaf8a7a2
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/vio.h> #include <asm/vio.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/iSeries/vio.h> #include <asm/iseries/vio.h>
MODULE_DESCRIPTION("iSeries Virtual DASD"); MODULE_DESCRIPTION("iSeries Virtual DASD");
MODULE_AUTHOR("Dave Boutcher"); MODULE_AUTHOR("Dave Boutcher");
......
drivers/cdrom/viocd.c
View file @ aaf8a7a2
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
#include <asm/vio.h> #include <asm/vio.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/vio.h> #include <asm/iseries/vio.h>
#define VIOCD_DEVICE "iseries/vcd" #define VIOCD_DEVICE "iseries/vcd"
#define VIOCD_DEVICE_DEVFS "iseries/vcd" #define VIOCD_DEVICE_DEVFS "iseries/vcd"
......
drivers/char/viocons.c
View file @ aaf8a7a2
...@@ -44,12 +44,12 @@ ...@@ -44,12 +44,12 @@
#include <linux/tty_flip.h> #include <linux/tty_flip.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <asm/iSeries/vio.h> #include <asm/iseries/vio.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/HvCallEvent.h> #include <asm/iseries/hv_call_event.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/iSeries/HvCall.h> #include <asm/iseries/hv_call.h>
#ifdef CONFIG_VT #ifdef CONFIG_VT
#error You must turn off CONFIG_VT to use CONFIG_VIOCONS #error You must turn off CONFIG_VT to use CONFIG_VIOCONS
......
drivers/char/viotape.c
View file @ aaf8a7a2
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
* All tape operations are performed by sending messages back and forth to * All tape operations are performed by sending messages back and forth to
* the OS/400 partition. The format of the messages is defined in * the OS/400 partition. The format of the messages is defined in
* iSeries/vio.h * iseries/vio.h
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/version.h> #include <linux/version.h>
...@@ -54,10 +54,10 @@ ...@@ -54,10 +54,10 @@
#include <asm/ioctls.h> #include <asm/ioctls.h>
#include <asm/vio.h> #include <asm/vio.h>
#include <asm/iSeries/vio.h> #include <asm/iseries/vio.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/HvCallEvent.h> #include <asm/iseries/hv_call_event.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#define VIOTAPE_VERSION "1.2" #define VIOTAPE_VERSION "1.2"
#define VIOTAPE_MAXREQ 1 #define VIOTAPE_MAXREQ 1
......
drivers/net/iseries_veth.c
View file @ aaf8a7a2
...@@ -72,12 +72,12 @@ ...@@ -72,12 +72,12 @@
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/iSeries/mf.h> #include <asm/iseries/mf.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/vio.h> #include <asm/vio.h>
......
drivers/scsi/ibmvscsi/iseries_vscsi.c
View file @ aaf8a7a2
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
* hypervisor system or a converged hypervisor system. * hypervisor system or a converged hypervisor system.
*/ */
#include <asm/iSeries/vio.h> #include <asm/iseries/vio.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iseries/hv_lp_config.h>
#include <asm/vio.h> #include <asm/vio.h>
#include <linux/device.h> #include <linux/device.h>
#include "ibmvscsi.h" #include "ibmvscsi.h"
......
include/asm-ppc64/iSeries/HvCall.h → include/asm-powerpc/iseries/hv_call.h
View file @ aaf8a7a2
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
* This file contains the "hypervisor call" interface which is used to * This file contains the "hypervisor call" interface which is used to
* drive the hypervisor from the OS. * drive the hypervisor from the OS.
*/ */
#ifndef _HVCALL_H #ifndef _ASM_POWERPC_ISERIES_HV_CALL_H
#define _HVCALL_H #define _ASM_POWERPC_ISERIES_HV_CALL_H
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/paca.h> #include <asm/paca.h>
/* Type of yield for HvCallBaseYieldProcessor */ /* Type of yield for HvCallBaseYieldProcessor */
...@@ -110,4 +110,4 @@ static inline void HvCall_sendIPI(struct paca_struct *targetPaca) ...@@ -110,4 +110,4 @@ static inline void HvCall_sendIPI(struct paca_struct *targetPaca)
HvCall1(HvCallBaseSendIPI, targetPaca->paca_index); HvCall1(HvCallBaseSendIPI, targetPaca->paca_index);
} }
#endif /* _HVCALL_H */ #endif /* _ASM_POWERPC_ISERIES_HV_CALL_H */
include/asm-ppc64/iSeries/HvCallEvent.h → include/asm-powerpc/iseries/hv_call_event.h
View file @ aaf8a7a2
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
* This file contains the "hypervisor call" interface which is used to * This file contains the "hypervisor call" interface which is used to
* drive the hypervisor from the OS. * drive the hypervisor from the OS.
*/ */
#ifndef _HVCALLEVENT_H #ifndef _ASM_POWERPC_ISERIES_HV_CALL_EVENT_H
#define _HVCALLEVENT_H #define _ASM_POWERPC_ISERIES_HV_CALL_EVENT_H
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
struct HvLpEvent; struct HvLpEvent;
...@@ -250,4 +250,4 @@ static inline HvLpDma_Rc HvCallEvent_dmaToSp(void *local, u32 remote, ...@@ -250,4 +250,4 @@ static inline HvLpDma_Rc HvCallEvent_dmaToSp(void *local, u32 remote,
return HvCall4(HvCallEventDmaToSp, abs_addr, remote, length, dir); return HvCall4(HvCallEventDmaToSp, abs_addr, remote, length, dir);
} }
#endif /* _HVCALLEVENT_H */ #endif /* _ASM_POWERPC_ISERIES_HV_CALL_EVENT_H */
include/asm-ppc64/iSeries/HvCallSc.h → include/asm-powerpc/iseries/hv_call_sc.h
View file @ aaf8a7a2
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _HVCALLSC_H #ifndef _ASM_POWERPC_ISERIES_HV_CALL_SC_H
#define _HVCALLSC_H #define _ASM_POWERPC_ISERIES_HV_CALL_SC_H
#include <linux/types.h> #include <linux/types.h>
...@@ -48,4 +48,4 @@ extern u64 HvCall5Ret16(u64, void *, u64, u64, u64, u64, u64); ...@@ -48,4 +48,4 @@ extern u64 HvCall5Ret16(u64, void *, u64, u64, u64, u64, u64);
extern u64 HvCall6Ret16(u64, void *, u64, u64, u64, u64, u64, u64); extern u64 HvCall6Ret16(u64, void *, u64, u64, u64, u64, u64, u64);
extern u64 HvCall7Ret16(u64, void *, u64, u64 ,u64 ,u64 ,u64 ,u64 ,u64); extern u64 HvCall7Ret16(u64, void *, u64, u64 ,u64 ,u64 ,u64 ,u64 ,u64);
#endif /* _HVCALLSC_H */ #endif /* _ASM_POWERPC_ISERIES_HV_CALL_SC_H */
include/asm-ppc64/iSeries/HvCallXm.h → include/asm-powerpc/iseries/hv_call_xm.h
View file @ aaf8a7a2
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
* This file contains the "hypervisor call" interface which is used to * This file contains the "hypervisor call" interface which is used to
* drive the hypervisor from SLIC. * drive the hypervisor from SLIC.
*/ */
#ifndef _HVCALLXM_H #ifndef _ASM_POWERPC_ISERIES_HV_CALL_XM_H
#define _HVCALLXM_H #define _ASM_POWERPC_ISERIES_HV_CALL_XM_H
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#define HvCallXmGetTceTableParms HvCallXm + 0 #define HvCallXmGetTceTableParms HvCallXm + 0
#define HvCallXmTestBus HvCallXm + 1 #define HvCallXmTestBus HvCallXm + 1
...@@ -75,4 +75,4 @@ static inline u64 HvCallXm_loadTod(void) ...@@ -75,4 +75,4 @@ static inline u64 HvCallXm_loadTod(void)
return HvCall0(HvCallXmLoadTod); return HvCall0(HvCallXmLoadTod);
} }
#endif /* _HVCALLXM_H */ #endif /* _ASM_POWERPC_ISERIES_HV_CALL_XM_H */
include/asm-ppc64/iSeries/HvLpConfig.h → include/asm-powerpc/iseries/hv_lp_config.h
View file @ aaf8a7a2
...@@ -16,17 +16,17 @@ ...@@ -16,17 +16,17 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _HVLPCONFIG_H #ifndef _ASM_POWERPC_ISERIES_HV_LP_CONFIG_H
#define _HVLPCONFIG_H #define _ASM_POWERPC_ISERIES_HV_LP_CONFIG_H
/* /*
* This file contains the interface to the LPAR configuration data * This file contains the interface to the LPAR configuration data
* to determine which resources should be allocated to each partition. * to determine which resources should be allocated to each partition.
*/ */
#include <asm/iSeries/HvCallSc.h> #include <asm/iseries/hv_call_sc.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/ItLpNaca.h> #include <asm/iseries/it_lp_naca.h>
enum { enum {
HvCallCfg_Cur = 0, HvCallCfg_Cur = 0,
...@@ -135,4 +135,4 @@ static inline HvLpIndex HvLpConfig_getHostingLpIndex(HvLpIndex lp) ...@@ -135,4 +135,4 @@ static inline HvLpIndex HvLpConfig_getHostingLpIndex(HvLpIndex lp)
return HvCall1(HvCallCfgGetHostingLpIndex, lp); return HvCall1(HvCallCfgGetHostingLpIndex, lp);
} }
#endif /* _HVLPCONFIG_H */ #endif /* _ASM_POWERPC_ISERIES_HV_LP_CONFIG_H */
include/asm-ppc64/iSeries/HvLpEvent.h → include/asm-powerpc/iseries/hv_lp_event.h
View file @ aaf8a7a2
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
/* This file contains the class for HV events in the system. */ /* This file contains the class for HV events in the system. */
#ifndef _HVLPEVENT_H #ifndef _ASM_POWERPC_ISERIES_HV_LP_EVENT_H
#define _HVLPEVENT_H #define _ASM_POWERPC_ISERIES_HV_LP_EVENT_H
#include <asm/types.h> #include <asm/types.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvCallEvent.h> #include <asm/iseries/hv_call_event.h>
/* /*
* HvLpEvent is the structure for Lp Event messages passed between * HvLpEvent is the structure for Lp Event messages passed between
...@@ -139,4 +139,4 @@ extern int HvLpEvent_closePath(HvLpEvent_Type eventType, HvLpIndex lpIndex); ...@@ -139,4 +139,4 @@ extern int HvLpEvent_closePath(HvLpEvent_Type eventType, HvLpIndex lpIndex);
#define HvLpDma_Rc_InvalidAddress 4 #define HvLpDma_Rc_InvalidAddress 4
#define HvLpDma_Rc_InvalidLength 5 #define HvLpDma_Rc_InvalidLength 5
#endif /* _HVLPEVENT_H */ #endif /* _ASM_POWERPC_ISERIES_HV_LP_EVENT_H */
include/asm-ppc64/iSeries/HvTypes.h → include/asm-powerpc/iseries/hv_types.h
View file @ aaf8a7a2
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _HVTYPES_H #ifndef _ASM_POWERPC_ISERIES_HV_TYPES_H
#define _HVTYPES_H #define _ASM_POWERPC_ISERIES_HV_TYPES_H
/* /*
* General typedefs for the hypervisor. * General typedefs for the hypervisor.
...@@ -110,4 +110,4 @@ struct HvLpBufferList { ...@@ -110,4 +110,4 @@ struct HvLpBufferList {
u64 len; u64 len;
}; };
#endif /* _HVTYPES_H */ #endif /* _ASM_POWERPC_ISERIES_HV_TYPES_H */
include/asm-ppc64/iSeries/iSeries_io.h → include/asm-powerpc/iseries/iseries_io.h
View file @ aaf8a7a2
#ifndef _ISERIES_IO_H #ifndef _ASM_POWERPC_ISERIES_ISERIES_IO_H
#define _ISERIES_IO_H #define _ASM_POWERPC_ISERIES_ISERIES_IO_H
#include <linux/config.h> #include <linux/config.h>
...@@ -46,4 +46,4 @@ extern void iSeries_memcpy_fromio(void *dest, ...@@ -46,4 +46,4 @@ extern void iSeries_memcpy_fromio(void *dest,
const volatile void __iomem *source, size_t n); const volatile void __iomem *source, size_t n);
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
#endif /* _ISERIES_IO_H */ #endif /* _ASM_POWERPC_ISERIES_ISERIES_IO_H */
include/asm-ppc64/iSeries/ItExtVpdPanel.h → include/asm-powerpc/iseries/it_exp_vpd_panel.h
View file @ aaf8a7a2
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _ITEXTVPDPANEL_H #ifndef _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H
#define _ITEXTVPDPANEL_H #define _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H
/* /*
* This struct maps the panel information * This struct maps the panel information
...@@ -49,4 +49,4 @@ struct ItExtVpdPanel { ...@@ -49,4 +49,4 @@ struct ItExtVpdPanel {
extern struct ItExtVpdPanel xItExtVpdPanel; extern struct ItExtVpdPanel xItExtVpdPanel;
#endif /* _ITEXTVPDPANEL_H */ #endif /* _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H */
include/asm-ppc64/iSeries/ItLpNaca.h → include/asm-powerpc/iseries/it_lp_naca.h
View file @ aaf8a7a2
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _ITLPNACA_H #ifndef _ASM_POWERPC_ISERIES_IT_LP_NACA_H
#define _ITLPNACA_H #define _ASM_POWERPC_ISERIES_IT_LP_NACA_H
#include <linux/types.h> #include <linux/types.h>
...@@ -77,4 +77,4 @@ struct ItLpNaca { ...@@ -77,4 +77,4 @@ struct ItLpNaca {
extern struct ItLpNaca itLpNaca; extern struct ItLpNaca itLpNaca;
#endif /* _ITLPNACA_H */ #endif /* _ASM_POWERPC_ISERIES_IT_LP_NACA_H */
include/asm-ppc64/iSeries/ItLpQueue.h → include/asm-powerpc/iseries/it_lp_queue.h
View file @ aaf8a7a2
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _ITLPQUEUE_H #ifndef _ASM_POWERPC_ISERIES_IT_LP_QUEUE_H
#define _ITLPQUEUE_H #define _ASM_POWERPC_ISERIES_IT_LP_QUEUE_H
/* /*
* This control block defines the simple LP queue structure that is * This control block defines the simple LP queue structure that is
...@@ -78,4 +78,4 @@ extern int hvlpevent_is_pending(void); ...@@ -78,4 +78,4 @@ extern int hvlpevent_is_pending(void);
extern void process_hvlpevents(struct pt_regs *); extern void process_hvlpevents(struct pt_regs *);
extern void setup_hvlpevent_queue(void); extern void setup_hvlpevent_queue(void);
#endif /* _ITLPQUEUE_H */ #endif /* _ASM_POWERPC_ISERIES_IT_LP_QUEUE_H */
include/asm-ppc64/iSeries/ItLpRegSave.h → include/asm-powerpc/iseries/it_lp_reg_save.h
View file @ aaf8a7a2
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _ITLPREGSAVE_H #ifndef _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H
#define _ITLPREGSAVE_H #define _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H
/* /*
* This control block contains the data that is shared between PLIC * This control block contains the data that is shared between PLIC
......
include/asm-ppc64/iSeries/LparMap.h → include/asm-powerpc/iseries/lpar_map.h
View file @ aaf8a7a2
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _LPARMAP_H #ifndef _ASM_POWERPC_ISERIES_LPAR_MAP_H
#define _LPARMAP_H #define _ASM_POWERPC_ISERIES_LPAR_MAP_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -80,4 +80,4 @@ extern const struct LparMap xLparMap; ...@@ -80,4 +80,4 @@ extern const struct LparMap xLparMap;
/* the fixed address where the LparMap exists */ /* the fixed address where the LparMap exists */
#define LPARMAP_PHYS 0x7000 #define LPARMAP_PHYS 0x7000
#endif /* _LPARMAP_H */ #endif /* _ASM_POWERPC_ISERIES_LPAR_MAP_H */
include/asm-ppc64/iSeries/mf.h → include/asm-powerpc/iseries/mf.h
View file @ aaf8a7a2
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _ASM_PPC64_ISERIES_MF_H #ifndef _ASM_POWERPC_ISERIES_MF_H
#define _ASM_PPC64_ISERIES_MF_H #define _ASM_POWERPC_ISERIES_MF_H
#include <linux/types.h> #include <linux/types.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvCallEvent.h> #include <asm/iseries/hv_call_event.h>
struct rtc_time; struct rtc_time;
...@@ -54,4 +54,4 @@ extern int mf_get_rtc(struct rtc_time *tm); ...@@ -54,4 +54,4 @@ extern int mf_get_rtc(struct rtc_time *tm);
extern int mf_get_boot_rtc(struct rtc_time *tm); extern int mf_get_boot_rtc(struct rtc_time *tm);
extern int mf_set_rtc(struct rtc_time *tm); extern int mf_set_rtc(struct rtc_time *tm);
#endif /* _ASM_PPC64_ISERIES_MF_H */ #endif /* _ASM_POWERPC_ISERIES_MF_H */
include/asm-ppc64/iSeries/vio.h → include/asm-powerpc/iseries/vio.h
View file @ aaf8a7a2
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _ISERIES_VIO_H #ifndef _ASM_POWERPC_ISERIES_VIO_H
#define _ISERIES_VIO_H #define _ASM_POWERPC_ISERIES_VIO_H
#include <asm/iSeries/HvTypes.h> #include <asm/iseries/hv_types.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iseries/hv_lp_event.h>
/* /*
* iSeries virtual I/O events use the subtype field in * iSeries virtual I/O events use the subtype field in
...@@ -127,4 +127,4 @@ struct device; ...@@ -127,4 +127,4 @@ struct device;
extern struct device *iSeries_vio_dev; extern struct device *iSeries_vio_dev;
#endif /* _ISERIES_VIO_H */ #endif /* _ASM_POWERPC_ISERIES_VIO_H */
include/asm-powerpc/time.h
View file @ aaf8a7a2
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/iSeries/HvCall.h> #include <asm/iseries/hv_call.h>
#endif #endif
/* time.c */ /* time.c */
......
include/asm-ppc64/io.h
View file @ aaf8a7a2
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
#include <asm/iSeries/iSeries_io.h> #include <asm/iseries/iseries_io.h>
#endif #endif
#include <asm/synch.h> #include <asm/synch.h>
#include <asm/delay.h> #include <asm/delay.h>
......
include/asm-ppc64/paca.h
View file @ aaf8a7a2
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iSeries/ItLpRegSave.h> #include <asm/iseries/it_lp_reg_save.h>
#include <asm/mmu.h> #include <asm/mmu.h>
register struct paca_struct *local_paca asm("r13"); register struct paca_struct *local_paca asm("r13");
......
include/asm-ppc64/spinlock.h
View file @ aaf8a7a2
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/iSeries/HvCall.h> #include <asm/iseries/hv_call.h>
#define __raw_spin_is_locked(x) ((x)->slock != 0) #define __raw_spin_is_locked(x) ((x)->slock != 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7