From ca9d48e5538e0e0088a6d865091d3b9992d7378c Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 20 Jul 2008 17:40:19 +0000 Subject: 2008-07-20 Samuel Thibault * device/net_io.c (net_set_filter): Reference the proper member instead of casting pointers. * device/subrs.c (ether_sprintf): Set type of `i' to `int'. * i386/i386/trap.c (kernel_trap): Pass page fault address to printf. * i386/i386at/rtc.c (rtcget): Fix parenthesis to really test the bit. --- i386/i386/trap.c | 2 +- i386/i386at/rtc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'i386') diff --git a/i386/i386/trap.c b/i386/i386/trap.c index dd6c23c..9c96758 100644 --- a/i386/i386/trap.c +++ b/i386/i386/trap.c @@ -245,7 +245,7 @@ dump_ss(regs); assert(thread); map = thread->task->map; if (map == kernel_map) { - printf("kernel page fault at %08x:\n"); + printf("kernel page fault at %08x:\n", subcode); dump_ss(regs); panic("kernel thread accessed user space!\n"); } diff --git a/i386/i386at/rtc.c b/i386/i386at/rtc.c index a66c5a8..e0a03de 100644 --- a/i386/i386at/rtc.c +++ b/i386/i386at/rtc.c @@ -75,7 +75,7 @@ unsigned char *regs; first_rtcopen_ever = 0; } outb(RTC_ADDR, RTC_D); - if (inb(RTC_DATA) & RTC_VRT == 0) return(-1); + if ((inb(RTC_DATA) & RTC_VRT) == 0) return(-1); outb(RTC_ADDR, RTC_A); while (inb(RTC_DATA) & RTC_UIP) /* busy wait */ outb(RTC_ADDR, RTC_A); -- cgit v1.2.3