[PARISC] OS_ID_LINUX == 0x0006

We were assigned an OS_ID of 0x0006. Consistently use OS_ID_LINUX
instead of using the magic number. Also update the OS_ID_ defines in
asm/pdc.h to reflect this.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index c80c277454f399a9dbc78bb654c528344d7fb437..4398d2a95789b247c2676ae4f798631e45f77af0 100644 (file)
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -407,7 +407,9 @@ int pdc_model_info(struct pdc_model *model)
  * pdc_model_sysmodel - Get the system model name.
  * @name: A char array of at least 81 characters.
  *
- * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L)
+ * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L).
+ * Using OS_ID_HPUX will return the equivalent of the 'modelname' command
+ * on HP/UX.
  */
 int pdc_model_sysmodel(char *name)
 {

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 8471486a75657c519577d14158131c7a7fa1cb71..278f4b9f6a3878806c7199c8dedec4e48d41d8be 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -303,7 +303,7 @@ extern void eisa_init(void);
 
 static int __init parisc_init(void)
 {
-       u32 osid = (0x0006 << 16);
+       u32 osid = (OS_ID_LINUX << 16);
 
        parisc_proc_mkdir();
        parisc_init_resources();

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index a1094210cd1f26ba27a941fb7ce3be5ae4fada16..97b345858043a2f1572c477888b0530176a97496 100644 (file)
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -884,7 +884,7 @@ pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)
        if (!entry || !buf || !count)
                return -EINVAL;
 
-       if (unlikely(pdcs_osid != 0x0006))
+       if (unlikely(pdcs_osid != OS_ID_LINUX))
                return -EPERM;
 
        if (count > 16)
@@ -926,7 +926,7 @@ pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count)
        if (unlikely(pdcs_size <= 224))
                return -ENOSYS;
 
-       if (unlikely(pdcs_osid != 0x0006))
+       if (unlikely(pdcs_osid != OS_ID_LINUX))
                return -EPERM;
 
        size = pdcs_size - 224;

diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h
index 3d3446ec207ebd879aec6f1e56e7b0c0ae911865..33bff615d6e1922ba0fbaf9ba2c4f01aa6ab732c 100644 (file)
--- a/include/asm-parisc/pdc.h
+++ b/include/asm-parisc/pdc.h
@@ -278,12 +278,11 @@ typedef struct {
 /* constants for OS (NVM...) */
 #define OS_ID_NONE             0       /* Undefined OS ID      */
 #define OS_ID_HPUX             1       /* HP-UX OS             */
-#define OS_ID_LINUX            OS_ID_HPUX /* just use the same value as hpux */
 #define OS_ID_MPEXL            2       /* MPE XL OS            */
 #define OS_ID_OSF              3       /* OSF OS               */
 #define OS_ID_HPRT             4       /* HP-RT OS             */
 #define OS_ID_NOVEL            5       /* NOVELL OS            */
-#define OS_ID_NT               6       /* NT OS                */
+#define OS_ID_LINUX            6       /* Linux                */
 
 
 /* constants for PDC_CHASSIS */