diff options
author | kmacy <kmacy@FreeBSD.org> | 2006-10-09 04:45:19 +0000 |
---|---|---|
committer | kmacy <kmacy@FreeBSD.org> | 2006-10-09 04:45:19 +0000 |
commit | 65e20bda0996ed88b33ac28272610e8f80624028 (patch) | |
tree | 00d373c5cebfa55cc10bd71e5bd0cb5c04c0a6a9 /sys/sparc64/pci | |
parent | e9d6f8c90513a65c602d0b73a29af6c05d1a5136 (diff) | |
download | FreeBSD-src-65e20bda0996ed88b33ac28272610e8f80624028.zip FreeBSD-src-65e20bda0996ed88b33ac28272610e8f80624028.tar.gz |
kernel clean up to make the sun4v kernel build
Reviewed by: jmg
Approved by: rwatson (mentor)
Diffstat (limited to 'sys/sparc64/pci')
-rw-r--r-- | sys/sparc64/pci/ofw_pcibus.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/sparc64/pci/ofw_pcibus.c b/sys/sparc64/pci/ofw_pcibus.c index 6ec1edd..6454ee3 100644 --- a/sys/sparc64/pci/ofw_pcibus.c +++ b/sys/sparc64/pci/ofw_pcibus.c @@ -46,7 +46,9 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/bus_common.h> +#ifndef SUN4V #include <machine/cache.h> +#endif #include <machine/iommureg.h> #include <machine/resource.h> @@ -123,8 +125,10 @@ ofw_pcibus_probe(device_t dev) static void ofw_pcibus_setup_device(device_t bridge, u_int busno, u_int slot, u_int func) { - u_int lat, clnsz; - + u_int lat; +#ifndef SUN4V + u_int clnsz; +#endif /* * Initialize the latency timer register for busmaster devices to work * properly. This is another task which the firmware does not always @@ -146,6 +150,7 @@ ofw_pcibus_setup_device(device_t bridge, u_int busno, u_int slot, u_int func) PCIR_LATTIMER, min(lat, 255), 1); } +#ifndef SUN4V /* * Compute a value to write into the cache line size register. * The role of the streaming cache is unclear in write invalidate @@ -158,6 +163,7 @@ ofw_pcibus_setup_device(device_t bridge, u_int busno, u_int slot, u_int func) PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_CACHELNSZ, clnsz / 4, 1); +#endif /* * The preset in the intline register is usually wrong. Reset it to 255, * so that the PCI code will reroute the interrupt if needed. |