modify defines according to _ASM_POWERPC_ISERIES_

Signed-off-by: Kelly Daly <kelly@au.ibm.com>

diff --git a/include/asm-powerpc/iseries/hv_call.h b/include/asm-powerpc/iseries/hv_call.h
index af59cc1e969165338f82bedd4411d268e9b6c1e0..e9f831c9a5e507111bfd87362410cbe7835c5d3c 100644 (file)
--- a/include/asm-powerpc/iseries/hv_call.h
+++ b/include/asm-powerpc/iseries/hv_call.h
@@ -20,8 +20,8 @@
  * This file contains the "hypervisor call" interface which is used to
  * drive the hypervisor from the OS.
  */
  * This file contains the "hypervisor call" interface which is used to
  * drive the hypervisor from the OS.
  */

-#ifndef _HVCALL_H
-#define _HVCALL_H
+#ifndef _ASM_POWERPC_ISERIES_HV_CALL_H
+#define _ASM_POWERPC_ISERIES_HV_CALL_H

 
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>
 
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>


@@ -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 */

diff --git a/include/asm-powerpc/iseries/hv_call_event.h b/include/asm-powerpc/iseries/hv_call_event.h
index c2770b056ae89be905433e1e02597c7fb52be51b..46763a30590acef0ed4c8cac0b29a1d0d5651749 100644 (file)
--- a/include/asm-powerpc/iseries/hv_call_event.h
+++ b/include/asm-powerpc/iseries/hv_call_event.h
@@ -20,8 +20,8 @@
  * This file contains the "hypervisor call" interface which is used to
  * drive the hypervisor from the OS.
  */
  * This file contains the "hypervisor call" interface which is used to
  * drive the hypervisor from the OS.
  */

-#ifndef _HVCALLEVENT_H
-#define _HVCALLEVENT_H
+#ifndef _ASM_POWERPC_ISERIES_HV_CALL_EVENT_H
+#define _ASM_POWERPC_ISERIES_HV_CALL_EVENT_H

 
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>
 
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>


@@ -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 */

diff --git a/include/asm-powerpc/iseries/hv_call_sc.h b/include/asm-powerpc/iseries/hv_call_sc.h
index a62cef3822f9be9f0224ad5f983a4c10ccbd38e8..dec7e9d9ab7886c982f4fe97df5c301b025ec2d4 100644 (file)
--- a/include/asm-powerpc/iseries/hv_call_sc.h
+++ b/include/asm-powerpc/iseries/hv_call_sc.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _HVCALLSC_H
-#define _HVCALLSC_H
+#ifndef _ASM_POWERPC_ISERIES_HV_CALL_SC_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);
 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 HvCall6Ret16(u64, void *, 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 */

diff --git a/include/asm-powerpc/iseries/hv_call_xm.h b/include/asm-powerpc/iseries/hv_call_xm.h
index fd36b11612f885c28fdcc23ab2fe17f26fc78838..ca9202cb01ed0a2fa6d694da732acb435135761b 100644 (file)
--- a/include/asm-powerpc/iseries/hv_call_xm.h
+++ b/include/asm-powerpc/iseries/hv_call_xm.h
@@ -2,8 +2,8 @@
  * This file contains the "hypervisor call" interface which is used to
  * drive the hypervisor from SLIC.
  */
  * This file contains the "hypervisor call" interface which is used to
  * drive the hypervisor from SLIC.
  */

-#ifndef _HVCALLXM_H
-#define _HVCALLXM_H
+#ifndef _ASM_POWERPC_ISERIES_HV_CALL_XM_H
+#define _ASM_POWERPC_ISERIES_HV_CALL_XM_H

 
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>
 
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>


@@ -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 */

diff --git a/include/asm-powerpc/iseries/hv_lp_config.h b/include/asm-powerpc/iseries/hv_lp_config.h
index db577f079f253a8d936f3c4efc9052ec039c4619..bc00f036bca03d6f1abd9cb640964e6332da3b14 100644 (file)
--- a/include/asm-powerpc/iseries/hv_lp_config.h
+++ b/include/asm-powerpc/iseries/hv_lp_config.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _HVLPCONFIG_H
-#define _HVLPCONFIG_H
+#ifndef _ASM_POWERPC_ISERIES_HV_LP_CONFIG_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


@@ -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 */

diff --git a/include/asm-powerpc/iseries/hv_lp_event.h b/include/asm-powerpc/iseries/hv_lp_event.h
index 2a3b773854b1b4a6accd1b73d88c2bbbe59a8aa4..499ab1ad01854ae9deefaa3bb2b38ea17ec46ab1 100644 (file)
--- a/include/asm-powerpc/iseries/hv_lp_event.h
+++ b/include/asm-powerpc/iseries/hv_lp_event.h
@@ -19,8 +19,8 @@
 
 /* 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
-#define _HVLPEVENT_H
+#ifndef _ASM_POWERPC_ISERIES_HV_LP_EVENT_H
+#define _ASM_POWERPC_ISERIES_HV_LP_EVENT_H

 
 #include <asm/types.h>
 #include <asm/ptrace.h>
 
 #include <asm/types.h>
 #include <asm/ptrace.h>


@@ -139,4 +139,4 @@ extern int HvLpEvent_closePath(HvLpEvent_Type eventType, HvLpIndex lpIndex);
 #define HvLpDma_Rc_InvalidAddress 4
 #define HvLpDma_Rc_InvalidLength 5
 
 #define HvLpDma_Rc_InvalidAddress 4
 #define HvLpDma_Rc_InvalidLength 5
 

-#endif /* _HVLPEVENT_H */
+#endif /* _ASM_POWERPC_ISERIES_HV_LP_EVENT_H */

diff --git a/include/asm-powerpc/iseries/hv_types.h b/include/asm-powerpc/iseries/hv_types.h
index b1ef2b4cb3e3de084f67e2c6d5a440a82a448b2d..c38f7e3d01dceab2c0ba4a67646200a2b775e0ae 100644 (file)
--- a/include/asm-powerpc/iseries/hv_types.h
+++ b/include/asm-powerpc/iseries/hv_types.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _HVTYPES_H
-#define _HVTYPES_H
+#ifndef _ASM_POWERPC_ISERIES_HV_TYPES_H
+#define _ASM_POWERPC_ISERIES_HV_TYPES_H

 
 /*
  * General typedefs for the hypervisor.
 
 /*
  * General typedefs for the hypervisor.


@@ -110,4 +110,4 @@ struct HvLpBufferList {
        u64 len;
 };
 
        u64 len;
 };
 

-#endif /* _HVTYPES_H */
+#endif /* _ASM_POWERPC_ISERIES_HV_TYPES_H */

diff --git a/include/asm-powerpc/iseries/iseries_io.h b/include/asm-powerpc/iseries/iseries_io.h
index 9f79413342b3f7d096b40724d67fc06b2a53e0c0..56b2113ff0f5743fa8063067e9f818de6b5065e8 100644 (file)
--- a/include/asm-powerpc/iseries/iseries_io.h
+++ b/include/asm-powerpc/iseries/iseries_io.h
@@ -1,5 +1,5 @@
-#ifndef _ISERIES_IO_H
-#define _ISERIES_IO_H
+#ifndef _ASM_POWERPC_ISERIES_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,
                const volatile void __iomem *source, size_t n);
 
 #endif /* CONFIG_PPC_ISERIES */
                const volatile void __iomem *source, size_t n);
 
 #endif /* CONFIG_PPC_ISERIES */

-#endif /* _ISERIES_IO_H */
+#endif /* _ASM_POWERPC_ISERIES_ISERIES_IO_H */

diff --git a/include/asm-powerpc/iseries/it_exp_vpd_panel.h b/include/asm-powerpc/iseries/it_exp_vpd_panel.h
index 4c546a8802b4cfc55237851f54f253617e6acbed..66a17a230c529f1d795f7c5b64a5406dfa88bbaa 100644 (file)
--- a/include/asm-powerpc/iseries/it_exp_vpd_panel.h
+++ b/include/asm-powerpc/iseries/it_exp_vpd_panel.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _ITEXTVPDPANEL_H
-#define _ITEXTVPDPANEL_H
+#ifndef _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_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 {
 
 extern struct ItExtVpdPanel    xItExtVpdPanel;
 
 
 extern struct ItExtVpdPanel    xItExtVpdPanel;
 

-#endif /* _ITEXTVPDPANEL_H */
+#endif /* _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H */

diff --git a/include/asm-powerpc/iseries/it_lp_naca.h b/include/asm-powerpc/iseries/it_lp_naca.h
index 225d0176779da8203aa464e55098715fd566b817..c3ef1de45d82e751488ab966f9267ceafd6f26d1 100644 (file)
--- a/include/asm-powerpc/iseries/it_lp_naca.h
+++ b/include/asm-powerpc/iseries/it_lp_naca.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _ITLPNACA_H
-#define _ITLPNACA_H
+#ifndef _ASM_POWERPC_ISERIES_IT_LP_NACA_H
+#define _ASM_POWERPC_ISERIES_IT_LP_NACA_H

 
 #include <linux/types.h>
 
 
 #include <linux/types.h>
 


@@ -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 */

diff --git a/include/asm-powerpc/iseries/it_lp_queue.h b/include/asm-powerpc/iseries/it_lp_queue.h
index 69b26ad74135fceef296dae507336a47991e1d95..a60d03afbf95be5b79f61f4d7b0607ae382afcf8 100644 (file)
--- a/include/asm-powerpc/iseries/it_lp_queue.h
+++ b/include/asm-powerpc/iseries/it_lp_queue.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _ITLPQUEUE_H
-#define _ITLPQUEUE_H
+#ifndef _ASM_POWERPC_ISERIES_IT_LP_QUEUE_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);
 extern void process_hvlpevents(struct pt_regs *);
 extern void setup_hvlpevent_queue(void);
 
 extern void process_hvlpevents(struct pt_regs *);
 extern void setup_hvlpevent_queue(void);
 

-#endif /* _ITLPQUEUE_H */
+#endif /* _ASM_POWERPC_ISERIES_IT_LP_QUEUE_H */

diff --git a/include/asm-powerpc/iseries/it_lp_reg_save.h b/include/asm-powerpc/iseries/it_lp_reg_save.h
index 1b3087e76205371e4d7e23e7b4bf4c18216b5234..288044b702dee394dc6e2c43a732358e17a34d19 100644 (file)
--- a/include/asm-powerpc/iseries/it_lp_reg_save.h
+++ b/include/asm-powerpc/iseries/it_lp_reg_save.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _ITLPREGSAVE_H
-#define _ITLPREGSAVE_H
+#ifndef _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_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

diff --git a/include/asm-powerpc/iseries/lpar_map.h b/include/asm-powerpc/iseries/lpar_map.h
index a6840b186d03b87c1967ddb9cf945a3a8be53fb1..84fc321615bff77949bf7ff6faf268c7fb08b6f1 100644 (file)
--- a/include/asm-powerpc/iseries/lpar_map.h
+++ b/include/asm-powerpc/iseries/lpar_map.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _LPARMAP_H
-#define _LPARMAP_H
+#ifndef _ASM_POWERPC_ISERIES_LPAR_MAP_H
+#define _ASM_POWERPC_ISERIES_LPAR_MAP_H

 
 #ifndef __ASSEMBLY__
 
 
 #ifndef __ASSEMBLY__
 


@@ -80,4 +80,4 @@ extern const struct LparMap   xLparMap;
 /* the fixed address where the LparMap exists */
 #define LPARMAP_PHYS           0x7000
 
 /* the fixed address where the LparMap exists */
 #define LPARMAP_PHYS           0x7000
 

-#endif /* _LPARMAP_H */
+#endif /* _ASM_POWERPC_ISERIES_LPAR_MAP_H */

diff --git a/include/asm-powerpc/iseries/mf.h b/include/asm-powerpc/iseries/mf.h
index dc6843e72aff6d285b29b97d2dda566129ebebb5..e7bd57a03fb17a20c38b7cb92debb5cec5eb126c 100644 (file)
--- a/include/asm-powerpc/iseries/mf.h
+++ b/include/asm-powerpc/iseries/mf.h
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */

-#ifndef _ASM_PPC64_ISERIES_MF_H
-#define _ASM_PPC64_ISERIES_MF_H
+#ifndef _ASM_POWERPC_ISERIES_MF_H
+#define _ASM_POWERPC_ISERIES_MF_H

 
 #include <linux/types.h>
 
 
 #include <linux/types.h>
 


@@ -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_set_rtc(struct rtc_time *tm);
 
 extern int mf_get_boot_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 */

diff --git a/include/asm-powerpc/iseries/vio.h b/include/asm-powerpc/iseries/vio.h
index 2b57dbf5c257d96c8a4f4a5ab3f30ae12764c2cf..7e3a469420ddbd7e7592749bd7d7f54f4c3909d6 100644 (file)
--- a/include/asm-powerpc/iseries/vio.h
+++ b/include/asm-powerpc/iseries/vio.h
@@ -38,8 +38,8 @@
  * 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
-#define _ISERIES_VIO_H
+#ifndef _ASM_POWERPC_ISERIES_VIO_H
+#define _ASM_POWERPC_ISERIES_VIO_H

 
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>


@@ -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 */