Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / asm-ppc64 / iSeries / HvReleaseData.h

diff --git a/include/asm-ppc64/iSeries/HvReleaseData.h b/include/asm-ppc64/iSeries/HvReleaseData.h
index 183e5e738c26e405abcdf4d596c800bfe2dedc54..c8162e5ccb210fff3d288c9f92915251bb868669 100644 (file)
--- a/include/asm-ppc64/iSeries/HvReleaseData.h
+++ b/include/asm-ppc64/iSeries/HvReleaseData.h
@@ -1,17 +1,17 @@
 /*
  * HvReleaseData.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,47 +19,46 @@
 #ifndef _HVRELEASEDATA_H
 #define _HVRELEASEDATA_H
 
-//=============================================================================
-//
-//   This control block contains the critical information about the 
-//   release so that it can be changed in the future (ie, the virtual 
-//   address of the OS's NACA).
-//
+/*
+ * This control block contains the critical information about the
+ * release so that it can be changed in the future (ie, the virtual
+ * address of the OS's NACA).
+ */
 #include <asm/types.h>
 #include <asm/naca.h>
 
-//=============================================================================
-//
-//     When we IPL a secondary partition, we will check if if the 
-//     secondary xMinPlicVrmIndex > the primary xVrmIndex.  
-//     If it is then this tells PLIC that this secondary is not 
-//     supported running on this "old" of a level of PLIC.
-//
-//     Likewise, we will compare the primary xMinSlicVrmIndex to 
-//     the secondary xVrmIndex. 
-//     If the primary xMinSlicVrmDelta > secondary xVrmDelta then we 
-//     know that this PLIC does not support running an OS "that old".
-//
-//=============================================================================
+/*
+ * When we IPL a secondary partition, we will check if if the
+ * secondary xMinPlicVrmIndex > the primary xVrmIndex.
+ * If it is then this tells PLIC that this secondary is not
+ * supported running on this "old" of a level of PLIC.
+ *
+ * Likewise, we will compare the primary xMinSlicVrmIndex to
+ * the secondary xVrmIndex.
+ * If the primary xMinSlicVrmDelta > secondary xVrmDelta then we
+ * know that this PLIC does not support running an OS "that old".
+ */
+
+#define        HVREL_TAGSINACTIVE      0x8000
+#define HVREL_32BIT            0x4000
+#define HVREL_NOSHAREDPROCS    0x2000
+#define HVREL_NOHMT            0x1000
 
-struct HvReleaseData
-{
-       u32     xDesc;                  // Descriptor   "HvRD" ebcdic   x00-x03
-       u16     xSize;                  // Size of this control block   x04-x05
-       u16     xVpdAreasPtrOffset;     // Offset in NACA of ItVpdAreas x06-x07
-       struct  naca_struct * xSlicNacaAddr; // Virt addr of SLIC NACA  x08-x0F
-       u32     xMsNucDataOffset;       // Offset of Linux Mapping Data x10-x13
-       u32     xRsvd1;                 // Reserved                     x14-x17
-       u16     xTagsMode:1;            // 0 == tags active, 1 == tags inactive
-       u16     xAddressSize:1;         // 0 == 64-bit, 1 == 32-bit
-       u16     xNoSharedProcs:1;       // 0 == shared procs, 1 == no shared
-       u16     xNoHMT:1;               // 0 == allow HMT, 1 == no HMT
-       u16     xRsvd2:12;              // Reserved                     x18-x19
-       u16     xVrmIndex;              // VRM Index of OS image        x1A-x1B
-       u16     xMinSupportedPlicVrmIndex;// Min PLIC level  (soft)     x1C-x1D
-       u16     xMinCompatablePlicVrmIndex;// Min PLIC levelP (hard)    x1E-x1F
-       char    xVrmName[12];           // Displayable name             x20-x2B
-       char    xRsvd3[20];             // Reserved                     x2C-x3F
+struct HvReleaseData {
+       u32     xDesc;          /* Descriptor "HvRD" ebcdic     x00-x03 */
+       u16     xSize;          /* Size of this control block   x04-x05 */
+       u16     xVpdAreasPtrOffset; /* Offset in NACA of ItVpdAreas x06-x07 */
+       struct  naca_struct     *xSlicNacaAddr; /* Virt addr of SLIC NACA x08-x0F */
+       u32     xMsNucDataOffset; /* Offset of Linux Mapping Data x10-x13 */
+       u32     xRsvd1;         /* Reserved                     x14-x17 */
+       u16     xFlags;
+       u16     xVrmIndex;      /* VRM Index of OS image        x1A-x1B */
+       u16     xMinSupportedPlicVrmIndex; /* Min PLIC level  (soft) x1C-x1D */
+       u16     xMinCompatablePlicVrmIndex; /* Min PLIC levelP (hard) x1E-x1F */
+       char    xVrmName[12];   /* Displayable name             x20-x2B */
+       char    xRsvd3[20];     /* Reserved                     x2C-x3F */
 };
 
+extern struct HvReleaseData    hvReleaseData;
+
 #endif /* _HVRELEASEDATA_H */