Deleted Added
full compact
mptable.c (31720) mptable.c (31723)
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 * $Id: mp_machdep.c,v 1.62 1997/12/12 21:45:23 tegge Exp $
25 * $Id: mp_machdep.c,v 1.63 1997/12/15 01:14:10 tegge Exp $
26 */
27
28#include "opt_smp.h"
29#include "opt_vm86.h"
30
31#ifdef SMP
32#include <machine/smptests.h>
33#else

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

1507struct simplelock fast_intr_lock;
1508
1509/* critical region around INTR() routines */
1510struct simplelock intr_lock;
1511
1512/* lock regions protected in UP kernel via cli/sti */
1513struct simplelock mpintr_lock;
1514
26 */
27
28#include "opt_smp.h"
29#include "opt_vm86.h"
30
31#ifdef SMP
32#include <machine/smptests.h>
33#else

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

1507struct simplelock fast_intr_lock;
1508
1509/* critical region around INTR() routines */
1510struct simplelock intr_lock;
1511
1512/* lock regions protected in UP kernel via cli/sti */
1513struct simplelock mpintr_lock;
1514
1515/* lock region used by kernel profiling */
1516struct simplelock mcount_lock;
1517
1515#ifdef USE_COMLOCK
1516/* locks com (tty) data/hardware accesses: a FASTINTR() */
1517struct simplelock com_lock;
1518#endif /* USE_COMLOCK */
1519
1520#ifdef USE_CLOCKLOCK
1521/* lock regions around the clock hardware */
1522struct simplelock clock_lock;

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

1531 */
1532 mp_lock = 0x00000001;
1533
1534 /* ISR uses its own "giant lock" */
1535 isr_lock = FREE_LOCK;
1536
1537 s_lock_init((struct simplelock*)&mpintr_lock);
1538
1518#ifdef USE_COMLOCK
1519/* locks com (tty) data/hardware accesses: a FASTINTR() */
1520struct simplelock com_lock;
1521#endif /* USE_COMLOCK */
1522
1523#ifdef USE_CLOCKLOCK
1524/* lock regions around the clock hardware */
1525struct simplelock clock_lock;

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

1534 */
1535 mp_lock = 0x00000001;
1536
1537 /* ISR uses its own "giant lock" */
1538 isr_lock = FREE_LOCK;
1539
1540 s_lock_init((struct simplelock*)&mpintr_lock);
1541
1542 s_lock_init((struct simplelock*)&mcount_lock);
1543
1539 s_lock_init((struct simplelock*)&fast_intr_lock);
1540 s_lock_init((struct simplelock*)&intr_lock);
1541 s_lock_init((struct simplelock*)&imen_lock);
1542 s_lock_init((struct simplelock*)&cpl_lock);
1543
1544#ifdef USE_COMLOCK
1545 s_lock_init((struct simplelock*)&com_lock);
1546#endif /* USE_COMLOCK */

--- 831 unchanged lines hidden ---
1544 s_lock_init((struct simplelock*)&fast_intr_lock);
1545 s_lock_init((struct simplelock*)&intr_lock);
1546 s_lock_init((struct simplelock*)&imen_lock);
1547 s_lock_init((struct simplelock*)&cpl_lock);
1548
1549#ifdef USE_COMLOCK
1550 s_lock_init((struct simplelock*)&com_lock);
1551#endif /* USE_COMLOCK */

--- 831 unchanged lines hidden ---