diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | device/net_io.c | 4 | ||||
| -rw-r--r-- | device/subrs.c | 2 | ||||
| -rw-r--r-- | i386/i386/trap.c | 2 | ||||
| -rw-r--r-- | i386/i386at/rtc.c | 2 |
5 files changed, 10 insertions, 5 deletions
@@ -8,6 +8,11 @@ * kern/mach_clock.c (timeout): Make the `fcn' parameter take a void * instead of char *. * kern/mach_clock.h (timeout): Likewise. + * 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. 2008-07-19 Barry deFreese <bddebian@comcast.net> diff --git a/device/net_io.c b/device/net_io.c index dca99d76..a6f842e5 100644 --- a/device/net_io.c +++ b/device/net_io.c @@ -1371,10 +1371,10 @@ net_set_filter(ifp, rcv_port, priority, filter, filter_count) /* Not checking for the same key values */ if (*p == 0) { - queue_init ((queue_t) hash_entp); + queue_init (&hash_entp->chain); *p = hash_entp; } else { - enqueue_tail((queue_t)*p, hash_entp); + enqueue_tail(&(*p)->chain, &hash_entp->chain); } ((net_hash_header_t)my_infp)->ref_count++; diff --git a/device/subrs.c b/device/subrs.c index 9b2b9ade..c2fe7ec2 100644 --- a/device/subrs.c +++ b/device/subrs.c @@ -63,7 +63,7 @@ char * ether_sprintf(ap) register u_char *ap; { - register i; + register int i; static char etherbuf[18]; register char *cp = etherbuf; static char digits[] = "0123456789abcdef"; diff --git a/i386/i386/trap.c b/i386/i386/trap.c index dd6c23ca..9c96758d 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 a66c5a8c..e0a03dee 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); |