Deleted Added
full compact
autoconf.c (182688) autoconf.c (221869)
1/*-
2 * Copyright (c) 2001 Jake Burkholder.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Jake Burkholder.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/sparc64/sparc64/autoconf.c 182688 2008-09-02 21:06:28Z marius $");
28__FBSDID("$FreeBSD: head/sys/sparc64/sparc64/autoconf.c 221869 2011-05-14 01:53:38Z attilio $");
29
30#include "opt_isa.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/bus.h>
35#include <sys/cons.h>
36#include <sys/kernel.h>

--- 24 unchanged lines hidden (view full) ---

61
62 nexusdev = device_add_child(root_bus, "nexus", 0);
63}
64
65static void
66configure(void *dummy)
67{
68
29
30#include "opt_isa.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/bus.h>
35#include <sys/cons.h>
36#include <sys/kernel.h>

--- 24 unchanged lines hidden (view full) ---

61
62 nexusdev = device_add_child(root_bus, "nexus", 0);
63}
64
65static void
66configure(void *dummy)
67{
68
69#ifdef SUN4V
70 intr_restore_all(0x16);
71#endif
72 root_bus_configure();
73#ifdef DEV_ISA
74 /*
75 * We bypass isa_probe_children(9) here in order to avoid
76 * invasive probes done by identify-routines of ISA drivers,
77 * which in turn can trigger master/target aborts, and the
78 * addition of ISA hints, which might erroneously exist.
79 */

--- 12 unchanged lines hidden ---
69 root_bus_configure();
70#ifdef DEV_ISA
71 /*
72 * We bypass isa_probe_children(9) here in order to avoid
73 * invasive probes done by identify-routines of ISA drivers,
74 * which in turn can trigger master/target aborts, and the
75 * addition of ISA hints, which might erroneously exist.
76 */

--- 12 unchanged lines hidden ---