summaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2006-06-21 19:27:29 +0000
committerKyle McMartin <kyle@hera.kernel.org>2006-06-27 23:28:42 +0000
commitec1fdc24c2ae012b078ba0187ceef208e08a3aec (patch)
treee615b4d1fe299ff835d9c21d6ae93214d22d67b3 /arch/parisc
parenta9d2d386c42b816a81eb1d02dfb7b502ba8cea82 (diff)
downloadblackbird-op-linux-ec1fdc24c2ae012b078ba0187ceef208e08a3aec.tar.gz
blackbird-op-linux-ec1fdc24c2ae012b078ba0187ceef208e08a3aec.zip
[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>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/kernel/firmware.c4
-rw-r--r--arch/parisc/kernel/setup.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index c80c277454f3..4398d2a95789 100644
--- 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 8471486a7565..278f4b9f6a38 100644
--- 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();
OpenPOWER on IntegriCloud