From 31c55b5d78284544bfe967a3fb95e6ef484d9022 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Oct 2005 17:09:16 +1000
Subject: [PATCH] --- yaml --- r: 11579 b: refs/heads/master c:
 0e29bb1a4ef69120a614391a649510010031dd8a h: refs/heads/master i:   11577:
 4407ee02e0fed36e95c6d6b166602f77637e1ada   11575:
 62807697cf19ec948cb82bbafa4aeec999531d41 v: v3

---
 [refs]                                                     | 2 +-
 .../powerpc/platforms/iseries/call_hpt.h}                  | 7 +++----
 trunk/arch/powerpc/platforms/iseries/htab.c                | 3 ++-
 trunk/arch/powerpc/platforms/iseries/setup.c               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename trunk/{include/asm-ppc64/iSeries/HvCallHpt.h => arch/powerpc/platforms/iseries/call_hpt.h} (96%)

diff --git a/[refs] b/[refs]
index 5fb890d287ce..25b66a1a9f8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20f48ccfa015d8b8391bbf07fc27618453f44969
+refs/heads/master: 0e29bb1a4ef69120a614391a649510010031dd8a
diff --git a/trunk/include/asm-ppc64/iSeries/HvCallHpt.h b/trunk/arch/powerpc/platforms/iseries/call_hpt.h
similarity index 96%
rename from trunk/include/asm-ppc64/iSeries/HvCallHpt.h
rename to trunk/arch/powerpc/platforms/iseries/call_hpt.h
index 43a1969230b8..321f3bb7a8f5 100644
--- a/trunk/include/asm-ppc64/iSeries/HvCallHpt.h
+++ b/trunk/arch/powerpc/platforms/iseries/call_hpt.h
@@ -1,5 +1,4 @@
 /*
- * HvCallHpt.h
  * Copyright (C) 2001  Mike Corrigan IBM Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-#ifndef _HVCALLHPT_H
-#define _HVCALLHPT_H
+#ifndef _PLATFORMS_ISERIES_CALL_HPT_H
+#define _PLATFORMS_ISERIES_CALL_HPT_H
 
 /*
  * This file contains the "hypervisor call" interface which is used to
@@ -99,4 +98,4 @@ static inline void HvCallHpt_addValidate(u32 hpteIndex, u32 hBit, hpte_t *hpte)
 	HvCall4(HvCallHptAddValidate, hpteIndex, hBit, hpte->v, hpte->r);
 }
 
-#endif /* _HVCALLHPT_H */
+#endif /* _PLATFORMS_ISERIES_CALL_HPT_H */
diff --git a/trunk/arch/powerpc/platforms/iseries/htab.c b/trunk/arch/powerpc/platforms/iseries/htab.c
index 431b22767d06..c00b8e9e2b3c 100644
--- a/trunk/arch/powerpc/platforms/iseries/htab.c
+++ b/trunk/arch/powerpc/platforms/iseries/htab.c
@@ -14,10 +14,11 @@
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
 #include <asm/mmu_context.h>
-#include <asm/iSeries/HvCallHpt.h>
 #include <asm/abs_addr.h>
 #include <linux/spinlock.h>
 
+#include "call_hpt.h"
+
 static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp =
 	{ [0 ... 63] = SPIN_LOCK_UNLOCKED};
 
diff --git a/trunk/arch/powerpc/platforms/iseries/setup.c b/trunk/arch/powerpc/platforms/iseries/setup.c
index b6cf050a8c27..93852c2ee5de 100644
--- a/trunk/arch/powerpc/platforms/iseries/setup.c
+++ b/trunk/arch/powerpc/platforms/iseries/setup.c
@@ -45,7 +45,6 @@
 #include <asm/cache.h>
 #include <asm/sections.h>
 #include <asm/abs_addr.h>
-#include <asm/iSeries/HvCallHpt.h>
 #include <asm/iSeries/HvLpConfig.h>
 #include <asm/iSeries/HvCallEvent.h>
 #include <asm/iSeries/HvCallXm.h>
@@ -60,6 +59,7 @@
 #include "processor_vpd.h"
 #include "main_store.h"
 #include "call_sm.h"
+#include "call_hpt.h"
 
 extern void hvlog(char *fmt, ...);