[PATCH] ppc64 iSeries: header file white space cleanups
This patch just contains white space and comment cleanups in the iSeries
headers files. There are no semantic changes.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/include/asm-ppc64/iSeries/HvLpConfig.h b/include/asm-ppc64/iSeries/HvLpConfig.h
index bdbd70f..47311cc 100644
--- a/include/asm-ppc64/iSeries/HvLpConfig.h
+++ b/include/asm-ppc64/iSeries/HvLpConfig.h
@@ -1,17 +1,17 @@
/*
* HvLpConfig.h
* Copyright (C) 2001 Mike Corrigan IBM Corporation
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -19,262 +19,285 @@
#ifndef _HVLPCONFIG_H
#define _HVLPCONFIG_H
-//===========================================================================
-//
-// This file contains the interface to the LPAR configuration data
-// to determine which resources should be allocated to each partition.
-//
-//===========================================================================
+/*
+ * This file contains the interface to the LPAR configuration data
+ * to determine which resources should be allocated to each partition.
+ */
#include <asm/iSeries/HvCallCfg.h>
#include <asm/iSeries/HvTypes.h>
#include <asm/iSeries/ItLpNaca.h>
#include <asm/iSeries/LparData.h>
-//-------------------------------------------------------------------
-// Constants
-//-------------------------------------------------------------------
-
extern HvLpIndex HvLpConfig_getLpIndex_outline(void);
-//===================================================================
static inline HvLpIndex HvLpConfig_getLpIndex(void)
{
return itLpNaca.xLpIndex;
}
-//===================================================================
+
static inline HvLpIndex HvLpConfig_getPrimaryLpIndex(void)
{
return itLpNaca.xPrimaryLpIndex;
}
-//=================================================================
+
static inline HvLpIndex HvLpConfig_getLps(void)
{
return HvCallCfg_getLps();
}
-//=================================================================
-static inline HvLpIndexMap HvLpConfig_getActiveLpMap(void)
+
+static inline HvLpIndexMap HvLpConfig_getActiveLpMap(void)
{
return HvCallCfg_getActiveLpMap();
}
-//=================================================================
-static inline u64 HvLpConfig_getSystemMsMegs(void)
+
+static inline u64 HvLpConfig_getSystemMsMegs(void)
{
return HvCallCfg_getSystemMsChunks() / HVCHUNKSPERMEG;
}
-//=================================================================
-static inline u64 HvLpConfig_getSystemMsChunks(void)
+
+static inline u64 HvLpConfig_getSystemMsChunks(void)
{
return HvCallCfg_getSystemMsChunks();
}
-//=================================================================
-static inline u64 HvLpConfig_getSystemMsPages(void)
+
+static inline u64 HvLpConfig_getSystemMsPages(void)
{
return HvCallCfg_getSystemMsChunks() * HVPAGESPERCHUNK;
}
-//================================================================
-static inline u64 HvLpConfig_getMsMegs(void)
+
+static inline u64 HvLpConfig_getMsMegs(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Cur) / HVCHUNKSPERMEG;
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Cur)
+ / HVCHUNKSPERMEG;
}
-//================================================================
-static inline u64 HvLpConfig_getMsChunks(void)
+
+static inline u64 HvLpConfig_getMsChunks(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Cur);
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Cur);
}
-//================================================================
-static inline u64 HvLpConfig_getMsPages(void)
+
+static inline u64 HvLpConfig_getMsPages(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Cur) * HVPAGESPERCHUNK;
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Cur)
+ * HVPAGESPERCHUNK;
}
-//================================================================
-static inline u64 HvLpConfig_getMinMsMegs(void)
+
+static inline u64 HvLpConfig_getMinMsMegs(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Min) / HVCHUNKSPERMEG;
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Min)
+ / HVCHUNKSPERMEG;
}
-//================================================================
-static inline u64 HvLpConfig_getMinMsChunks(void)
+
+static inline u64 HvLpConfig_getMinMsChunks(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Min);
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Min);
}
-//================================================================
-static inline u64 HvLpConfig_getMinMsPages(void)
+
+static inline u64 HvLpConfig_getMinMsPages(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Min) * HVPAGESPERCHUNK;
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Min)
+ * HVPAGESPERCHUNK;
}
-//================================================================
-static inline u64 HvLpConfig_getMinRuntimeMsMegs(void)
+
+static inline u64 HvLpConfig_getMinRuntimeMsMegs(void)
{
- return HvCallCfg_getMinRuntimeMsChunks(HvLpConfig_getLpIndex()) / HVCHUNKSPERMEG;
+ return HvCallCfg_getMinRuntimeMsChunks(HvLpConfig_getLpIndex())
+ / HVCHUNKSPERMEG;
}
-//===============================================================
-static inline u64 HvLpConfig_getMinRuntimeMsChunks(void)
+
+static inline u64 HvLpConfig_getMinRuntimeMsChunks(void)
{
return HvCallCfg_getMinRuntimeMsChunks(HvLpConfig_getLpIndex());
}
-//===============================================================
-static inline u64 HvLpConfig_getMinRuntimeMsPages(void)
+
+static inline u64 HvLpConfig_getMinRuntimeMsPages(void)
{
- return HvCallCfg_getMinRuntimeMsChunks(HvLpConfig_getLpIndex()) * HVPAGESPERCHUNK;
+ return HvCallCfg_getMinRuntimeMsChunks(HvLpConfig_getLpIndex())
+ * HVPAGESPERCHUNK;
}
-//===============================================================
-static inline u64 HvLpConfig_getMaxMsMegs(void)
+
+static inline u64 HvLpConfig_getMaxMsMegs(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Max) / HVCHUNKSPERMEG;
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Max)
+ / HVCHUNKSPERMEG;
}
-//===============================================================
-static inline u64 HvLpConfig_getMaxMsChunks(void)
+
+static inline u64 HvLpConfig_getMaxMsChunks(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Max);
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Max);
}
-//===============================================================
-static inline u64 HvLpConfig_getMaxMsPages(void)
+
+static inline u64 HvLpConfig_getMaxMsPages(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Max) * HVPAGESPERCHUNK;
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Max)
+ * HVPAGESPERCHUNK;
}
-//===============================================================
-static inline u64 HvLpConfig_getInitMsMegs(void)
+
+static inline u64 HvLpConfig_getInitMsMegs(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Init) / HVCHUNKSPERMEG;
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Init)
+ / HVCHUNKSPERMEG;
}
-//===============================================================
-static inline u64 HvLpConfig_getInitMsChunks(void)
+
+static inline u64 HvLpConfig_getInitMsChunks(void)
{
- return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Init);
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Init);
}
-//===============================================================
-static inline u64 HvLpConfig_getInitMsPages(void)
-{ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(),HvCallCfg_Init) * HVPAGESPERCHUNK;
+
+static inline u64 HvLpConfig_getInitMsPages(void)
+{
+ return HvCallCfg_getMsChunks(HvLpConfig_getLpIndex(), HvCallCfg_Init)
+ * HVPAGESPERCHUNK;
}
-//===============================================================
-static inline u64 HvLpConfig_getSystemPhysicalProcessors(void)
+
+static inline u64 HvLpConfig_getSystemPhysicalProcessors(void)
{
return HvCallCfg_getSystemPhysicalProcessors();
}
-//===============================================================
-static inline u64 HvLpConfig_getSystemLogicalProcessors(void)
+
+static inline u64 HvLpConfig_getSystemLogicalProcessors(void)
{
- return HvCallCfg_getSystemPhysicalProcessors() * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
+ return HvCallCfg_getSystemPhysicalProcessors()
+ * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
}
-//===============================================================
-static inline u64 HvLpConfig_getNumProcsInSharedPool(HvLpSharedPoolIndex sPI)
+
+static inline u64 HvLpConfig_getNumProcsInSharedPool(HvLpSharedPoolIndex sPI)
{
return HvCallCfg_getNumProcsInSharedPool(sPI);
}
-//===============================================================
-static inline u64 HvLpConfig_getPhysicalProcessors(void)
+
+static inline u64 HvLpConfig_getPhysicalProcessors(void)
{
- return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),HvCallCfg_Cur);
+ return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),
+ HvCallCfg_Cur);
}
-//===============================================================
-static inline u64 HvLpConfig_getLogicalProcessors(void)
+
+static inline u64 HvLpConfig_getLogicalProcessors(void)
{
- return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),HvCallCfg_Cur) * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
+ return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),
+ HvCallCfg_Cur)
+ * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
}
-//===============================================================
-static inline HvLpSharedPoolIndex HvLpConfig_getSharedPoolIndex(void)
+
+static inline HvLpSharedPoolIndex HvLpConfig_getSharedPoolIndex(void)
{
return HvCallCfg_getSharedPoolIndex(HvLpConfig_getLpIndex());
}
-//===============================================================
-static inline u64 HvLpConfig_getSharedProcUnits(void)
+
+static inline u64 HvLpConfig_getSharedProcUnits(void)
{
- return HvCallCfg_getSharedProcUnits(HvLpConfig_getLpIndex(),HvCallCfg_Cur);
+ return HvCallCfg_getSharedProcUnits(HvLpConfig_getLpIndex(),
+ HvCallCfg_Cur);
}
-//===============================================================
-static inline u64 HvLpConfig_getMinSharedProcUnits(void)
+
+static inline u64 HvLpConfig_getMinSharedProcUnits(void)
{
- return HvCallCfg_getSharedProcUnits(HvLpConfig_getLpIndex(),HvCallCfg_Min);
+ return HvCallCfg_getSharedProcUnits(HvLpConfig_getLpIndex(),
+ HvCallCfg_Min);
}
-//===============================================================
-static inline u64 HvLpConfig_getMaxSharedProcUnits(void)
+
+static inline u64 HvLpConfig_getMaxSharedProcUnits(void)
{
- return HvCallCfg_getSharedProcUnits(HvLpConfig_getLpIndex(),HvCallCfg_Max);
+ return HvCallCfg_getSharedProcUnits(HvLpConfig_getLpIndex(),
+ HvCallCfg_Max);
}
-//===============================================================
-static inline u64 HvLpConfig_getMinPhysicalProcessors(void)
+
+static inline u64 HvLpConfig_getMinPhysicalProcessors(void)
{
- return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),HvCallCfg_Min);
+ return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),
+ HvCallCfg_Min);
}
-//===============================================================
-static inline u64 HvLpConfig_getMinLogicalProcessors(void)
+
+static inline u64 HvLpConfig_getMinLogicalProcessors(void)
{
- return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),HvCallCfg_Min) * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
+ return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),
+ HvCallCfg_Min)
+ * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
}
-//===============================================================
-static inline u64 HvLpConfig_getMaxPhysicalProcessors(void)
+
+static inline u64 HvLpConfig_getMaxPhysicalProcessors(void)
{
- return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),HvCallCfg_Max);
+ return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),
+ HvCallCfg_Max);
}
-//===============================================================
-static inline u64 HvLpConfig_getMaxLogicalProcessors(void)
+
+static inline u64 HvLpConfig_getMaxLogicalProcessors(void)
{
- return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),HvCallCfg_Max) * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
+ return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),
+ HvCallCfg_Max)
+ * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
}
-//===============================================================
-static inline u64 HvLpConfig_getInitPhysicalProcessors(void)
+
+static inline u64 HvLpConfig_getInitPhysicalProcessors(void)
{
- return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),HvCallCfg_Init);
+ return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),
+ HvCallCfg_Init);
}
-//===============================================================
-static inline u64 HvLpConfig_getInitLogicalProcessors(void)
+
+static inline u64 HvLpConfig_getInitLogicalProcessors(void)
{
- return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),HvCallCfg_Init) * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
+ return HvCallCfg_getPhysicalProcessors(HvLpConfig_getLpIndex(),
+ HvCallCfg_Init)
+ * (/*getPaca()->getSecondaryThreadCount() +*/ 1);
}
-//================================================================
-static inline HvLpVirtualLanIndexMap HvLpConfig_getVirtualLanIndexMap(void)
+
+static inline HvLpVirtualLanIndexMap HvLpConfig_getVirtualLanIndexMap(void)
{
return HvCallCfg_getVirtualLanIndexMap(HvLpConfig_getLpIndex_outline());
}
-//===============================================================
-static inline HvLpVirtualLanIndexMap HvLpConfig_getVirtualLanIndexMapForLp(HvLpIndex lp)
+
+static inline HvLpVirtualLanIndexMap HvLpConfig_getVirtualLanIndexMapForLp(
+ HvLpIndex lp)
{
return HvCallCfg_getVirtualLanIndexMap(lp);
}
-//================================================================
-static inline HvLpIndex HvLpConfig_getBusOwner(HvBusNumber busNumber)
+
+static inline HvLpIndex HvLpConfig_getBusOwner(HvBusNumber busNumber)
{
return HvCallCfg_getBusOwner(busNumber);
}
-//===============================================================
-static inline int HvLpConfig_isBusDedicated(HvBusNumber busNumber)
+
+static inline int HvLpConfig_isBusDedicated(HvBusNumber busNumber)
{
return HvCallCfg_isBusDedicated(busNumber);
}
-//================================================================
-static inline HvLpIndexMap HvLpConfig_getBusAllocation(HvBusNumber busNumber)
+
+static inline HvLpIndexMap HvLpConfig_getBusAllocation(HvBusNumber busNumber)
{
return HvCallCfg_getBusAllocation(busNumber);
}
-//================================================================
-// returns the absolute real address of the load area
-static inline u64 HvLpConfig_getLoadAddress(void)
+
+/* returns the absolute real address of the load area */
+static inline u64 HvLpConfig_getLoadAddress(void)
{
return itLpNaca.xLoadAreaAddr & 0x7fffffffffffffff;
}
-//================================================================
-static inline u64 HvLpConfig_getLoadPages(void)
+
+static inline u64 HvLpConfig_getLoadPages(void)
{
return itLpNaca.xLoadAreaChunks * HVPAGESPERCHUNK;
}
-//================================================================
-static inline int HvLpConfig_isBusOwnedByThisLp(HvBusNumber busNumber)
+
+static inline int HvLpConfig_isBusOwnedByThisLp(HvBusNumber busNumber)
{
HvLpIndex busOwner = HvLpConfig_getBusOwner(busNumber);
return (busOwner == HvLpConfig_getLpIndex());
}
-//================================================================
-static inline int HvLpConfig_doLpsCommunicateOnVirtualLan(HvLpIndex lp1, HvLpIndex lp2)
+
+static inline int HvLpConfig_doLpsCommunicateOnVirtualLan(HvLpIndex lp1,
+ HvLpIndex lp2)
{
- HvLpVirtualLanIndexMap virtualLanIndexMap1 = HvCallCfg_getVirtualLanIndexMap( lp1 );
- HvLpVirtualLanIndexMap virtualLanIndexMap2 = HvCallCfg_getVirtualLanIndexMap( lp2 );
+ HvLpVirtualLanIndexMap virtualLanIndexMap1 =
+ HvCallCfg_getVirtualLanIndexMap(lp1);
+ HvLpVirtualLanIndexMap virtualLanIndexMap2 =
+ HvCallCfg_getVirtualLanIndexMap(lp2);
return ((virtualLanIndexMap1 & virtualLanIndexMap2) != 0);
}
-//================================================================
-static inline HvLpIndex HvLpConfig_getHostingLpIndex(HvLpIndex lp)
+
+static inline HvLpIndex HvLpConfig_getHostingLpIndex(HvLpIndex lp)
{
return HvCallCfg_getHostingLpIndex(lp);
}
-//================================================================
#endif /* _HVLPCONFIG_H */