فهرست منبع

[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>
Kyle McMartin 19 سال پیش
والد
کامیت
ec1fdc24c2
4فایلهای تغییر یافته به همراه7 افزوده شده و 6 حذف شده
  1. 3 1
      arch/parisc/kernel/firmware.c
  2. 1 1
      arch/parisc/kernel/setup.c
  3. 2 2
      drivers/parisc/pdc_stable.c
  4. 1 2
      include/asm-parisc/pdc.h

+ 3 - 1
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.
  * pdc_model_sysmodel - Get the system model name.
  * @name: A char array of at least 81 characters.
  * @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)
 int pdc_model_sysmodel(char *name)
 {
 {

+ 1 - 1
arch/parisc/kernel/setup.c

@@ -303,7 +303,7 @@ extern void eisa_init(void);
 
 
 static int __init parisc_init(void)
 static int __init parisc_init(void)
 {
 {
-	u32 osid = (0x0006 << 16);
+	u32 osid = (OS_ID_LINUX << 16);
 
 
 	parisc_proc_mkdir();
 	parisc_proc_mkdir();
 	parisc_init_resources();
 	parisc_init_resources();

+ 2 - 2
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)
 	if (!entry || !buf || !count)
 		return -EINVAL;
 		return -EINVAL;
 
 
-	if (unlikely(pdcs_osid != 0x0006))
+	if (unlikely(pdcs_osid != OS_ID_LINUX))
 		return -EPERM;
 		return -EPERM;
 
 
 	if (count > 16)
 	if (count > 16)
@@ -926,7 +926,7 @@ pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count)
 	if (unlikely(pdcs_size <= 224))
 	if (unlikely(pdcs_size <= 224))
 		return -ENOSYS;
 		return -ENOSYS;
 
 
-	if (unlikely(pdcs_osid != 0x0006))
+	if (unlikely(pdcs_osid != OS_ID_LINUX))
 		return -EPERM;
 		return -EPERM;
 
 
 	size = pdcs_size - 224;
 	size = pdcs_size - 224;

+ 1 - 2
include/asm-parisc/pdc.h

@@ -278,12 +278,11 @@ typedef struct {
 /* constants for OS (NVM...) */
 /* constants for OS (NVM...) */
 #define OS_ID_NONE		0	/* Undefined OS ID	*/
 #define OS_ID_NONE		0	/* Undefined OS ID	*/
 #define OS_ID_HPUX		1	/* HP-UX OS		*/
 #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_MPEXL		2	/* MPE XL OS		*/
 #define OS_ID_OSF		3	/* OSF OS		*/
 #define OS_ID_OSF		3	/* OSF OS		*/
 #define OS_ID_HPRT		4	/* HP-RT OS		*/
 #define OS_ID_HPRT		4	/* HP-RT OS		*/
 #define OS_ID_NOVEL		5	/* NOVELL 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 */
 /* constants for PDC_CHASSIS */