Current-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

re: current-sparc build failure in GENERIC_SCSI3



i suspect sparc/vmparam.h has a bug when all SUN4* options are
defined, but this patch gets things working again i suspect.

.mrg.


Index: sys/dev/sbus/agten.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sbus/agten.c,v
retrieving revision 1.23
diff -p -r1.23 agten.c
*** sys/dev/sbus/agten.c        27 Jan 2010 21:02:22 -0000      1.23
--- sys/dev/sbus/agten.c        29 Jan 2010 23:48:20 -0000
*************** __KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.
*** 52,57 ****
--- 52,59 ----
  #include <sys/systm.h>
  #include <sys/conf.h>
  
+ #include <uvm/uvm_extern.h>
+ 
  #include <dev/sun/fbio.h>
  #include <dev/sun/fbvar.h>
  #include <dev/sun/btreg.h>
*************** __KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.
*** 74,81 ****
  #include <dev/ic/i128reg.h>
  #include <dev/ic/i128var.h>
  
- #include <machine/vmparam.h>
- 
  #include "opt_agten.h"
  #include "ioconf.h"
  
--- 76,81 ----
*************** agten_attach(device_t parent, device_t d
*** 248,254 ****
        sc->sc_i128_fbsz = prom_getpropint(node, "i128_fb_size", -1);
        if (sbus_bus_map(sc->sc_bustag,
            sa->sa_reg[0].oa_space, sa->sa_reg[0].oa_base + reg,
!           (sc->sc_stride * sc->sc_height + PAGE_MASK) & ~PAGE_MASK,
            BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE, 
            &sc->sc_i128_fbh) != 0) {
  
--- 248,254 ----
        sc->sc_i128_fbsz = prom_getpropint(node, "i128_fb_size", -1);
        if (sbus_bus_map(sc->sc_bustag,
            sa->sa_reg[0].oa_space, sa->sa_reg[0].oa_base + reg,
!           round_page(sc->sc_stride * sc->sc_height),
            BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE, 
            &sc->sc_i128_fbh) != 0) {
  


Home | Main Index | Thread Index | Old Index