Deleted Added
full compact
mptable.h (108914) mptable.h (109623)
1/*
2 * Copyright (c) 1996, by Steve Passe
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

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

17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 *
1/*
2 * Copyright (c) 1996, by Steve Passe
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

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

17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 *
25 * $FreeBSD: head/sys/i386/include/mptable.h 108914 2003-01-08 01:33:18Z jhb $
25 * $FreeBSD: head/sys/i386/include/mptable.h 109623 2003-01-21 08:56:16Z alfred $
26 */
27
28#include "opt_cpu.h"
29#include "opt_kstack_pages.h"
30
31#ifdef SMP
32#include <machine/smptests.h>
33#else

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

914 /* Initialize fake proc entry for use with HT fixup. */
915 bzero(&proc, sizeof(proc));
916 proc.type = 0;
917 proc.cpu_flags = PROCENTRY_FLAG_EN;
918
919 pgeflag = 0; /* XXX - Not used under SMP yet. */
920
921 MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
26 */
27
28#include "opt_cpu.h"
29#include "opt_kstack_pages.h"
30
31#ifdef SMP
32#include <machine/smptests.h>
33#else

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

914 /* Initialize fake proc entry for use with HT fixup. */
915 bzero(&proc, sizeof(proc));
916 proc.type = 0;
917 proc.cpu_flags = PROCENTRY_FLAG_EN;
918
919 pgeflag = 0; /* XXX - Not used under SMP yet. */
920
921 MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
922 M_DEVBUF, M_WAITOK);
922 M_DEVBUF, 0);
923 MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
923 MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
924 M_DEVBUF, M_WAITOK);
924 M_DEVBUF, 0);
925 MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
925 MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
926 M_DEVBUF, M_WAITOK);
926 M_DEVBUF, 0);
927 MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
927 MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
928 M_DEVBUF, M_WAITOK);
928 M_DEVBUF, 0);
929
930 bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
931
932 for (i = 0; i < mp_napics; i++) {
933 for (j = 0; j < mp_napics; j++) {
934 /* same page frame as a previous IO apic? */
935 if (((vm_offset_t)SMPpt[NPTEPG-2-j] & PG_FRAME) ==
936 (io_apic_address[i] & PG_FRAME)) {

--- 1805 unchanged lines hidden ---
929
930 bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
931
932 for (i = 0; i < mp_napics; i++) {
933 for (j = 0; j < mp_napics; j++) {
934 /* same page frame as a previous IO apic? */
935 if (((vm_offset_t)SMPpt[NPTEPG-2-j] & PG_FRAME) ==
936 (io_apic_address[i] & PG_FRAME)) {

--- 1805 unchanged lines hidden ---