Commit ec1fdc24 authored by Kyle McMartin's avatar Kyle McMartin Committed by Kyle McMartin
Browse files

[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: default avatarKyle McMartin <kyle@parisc-linux.org>
parent a9d2d386

arch/parisc/kernel/firmware.c

+3 −1
Original line number Diff line number Diff line
@@ -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)

{

arch/parisc/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

drivers/parisc/pdc_stable.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/asm-parisc/pdc.h

+1 −2
Original line number Diff line number Diff line
@@ -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 */