diff options
| author | David Mosberger <davidm@tiger.hpl.hp.com> | 2002-08-12 02:40:40 -0700 |
|---|---|---|
| committer | David Mosberger <davidm@wailua.hpl.hp.com> | 2002-08-12 02:40:40 -0700 |
| commit | 8b2ef549943be6b1db55fc925cd7b4ae34f2a1fc (patch) | |
| tree | 1dd0ead861e6fca4585384522c6d4448b12a8000 | |
| parent | 2831300e37a7c2b64569e1d20a0d5c6a22217c15 (diff) | |
ia64: Print fpswa revision number. Based on patch by
KOCHI Takayoshi.
| -rw-r--r-- | arch/ia64/kernel/traps.c | 9 | ||||
| -rw-r--r-- | include/asm-ia64/system.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index 5ee868cdb311..66a2f54c8cf2 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c @@ -49,10 +49,15 @@ static fpswa_interface_t *fpswa_interface; void __init trap_init (void) { - printk("fpswa interface at %lx\n", ia64_boot_param->fpswa); - if (ia64_boot_param->fpswa) + int major = 0, minor = 0; + + if (ia64_boot_param->fpswa) { /* FPSWA fixup: make the interface pointer a kernel virtual address: */ fpswa_interface = __va(ia64_boot_param->fpswa); + major = fpswa_interface->revision & 0xffff; + minor = fpswa_interface->revision >> 16; + } + printk("fpswa interface at %lx (rev %d.%d)\n", ia64_boot_param->fpswa, major, minor); } /* diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h index 44d7fda7efd8..4e55d3f333e2 100644 --- a/include/asm-ia64/system.h +++ b/include/asm-ia64/system.h @@ -409,7 +409,7 @@ extern void ia64_load_extra (struct task_struct *task); { \ ia64_psr(ia64_task_regs(next))->dfh = 0; \ ia64_psr(ia64_task_regs(next))->mfh = 0; \ - } else \ + } else \ ia64_psr(ia64_task_regs(next))->dfh = 1; \ } \ __switch_to(prev,next,last); \ |