Deleted Added
full compact
smp.h (27663) smp.h (27728)
1/*
2 * ----------------------------------------------------------------------------
3 * "THE BEER-WARE LICENSE" (Revision 42):
4 * <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
5 * can do whatever you want with this stuff. If we meet some day, and you think
6 * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
7 * ----------------------------------------------------------------------------
8 *
1/*
2 * ----------------------------------------------------------------------------
3 * "THE BEER-WARE LICENSE" (Revision 42):
4 * <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
5 * can do whatever you want with this stuff. If we meet some day, and you think
6 * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
7 * ----------------------------------------------------------------------------
8 *
9 * $Id: smp.h,v 1.20 1997/07/23 20:42:16 fsmp Exp $
9 * $Id: smp.h,v 1.17 1997/07/28 03:40:09 smp Exp smp $
10 *
11 */
12
13#ifndef _MACHINE_SMP_H_
14#define _MACHINE_SMP_H_
15
16#ifdef KERNEL
17
18#if defined(SMP) && !defined(APIC_IO)
19# error APIC_IO required for SMP, add "options APIC_IO" to your config file.
20#endif /* SMP && !APIC_IO */
21
10 *
11 */
12
13#ifndef _MACHINE_SMP_H_
14#define _MACHINE_SMP_H_
15
16#ifdef KERNEL
17
18#if defined(SMP) && !defined(APIC_IO)
19# error APIC_IO required for SMP, add "options APIC_IO" to your config file.
20#endif /* SMP && !APIC_IO */
21
22/* Number of CPUs. */
22#if defined(SMP) && !defined(NCPU)
23# define NCPU 2
24#endif /* SMP && NCPU */
25
23#if defined(SMP) && !defined(NCPU)
24# define NCPU 2
25#endif /* SMP && NCPU */
26
27/* Number of IO APICs. */
28#if defined(APIC_IO) && !defined(NAPIC)
29# define NAPIC 1
30#endif /* SMP && NAPIC */
31
32
26#if defined(SMP) || defined(APIC_IO)
27
33#if defined(SMP) || defined(APIC_IO)
34
35#ifndef LOCORE
36
28/*
29 * For sending values to POST displays.
30 * XXX FIXME: where does this really belong, isa.h/isa.c perhaps?
31 */
32extern int current_postcode; /** XXX currently in mp_machdep.c */
33#define POSTCODE(X) current_postcode = (X), \
34 outb(0x80, current_postcode)
35#define POSTCODE_LO(X) current_postcode &= 0xf0, \

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

153extern int smp_active;
154extern int invltlb_ok;
155
156/* 'private' global data in locore.s */
157extern volatile u_int cpuid;
158extern volatile u_int cpu_lockid;
159extern volatile u_int other_cpus;
160
37/*
38 * For sending values to POST displays.
39 * XXX FIXME: where does this really belong, isa.h/isa.c perhaps?
40 */
41extern int current_postcode; /** XXX currently in mp_machdep.c */
42#define POSTCODE(X) current_postcode = (X), \
43 outb(0x80, current_postcode)
44#define POSTCODE_LO(X) current_postcode &= 0xf0, \

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

162extern int smp_active;
163extern int invltlb_ok;
164
165/* 'private' global data in locore.s */
166extern volatile u_int cpuid;
167extern volatile u_int cpu_lockid;
168extern volatile u_int other_cpus;
169
170#endif /* !LOCORE */
161#endif /* SMP || APIC_IO */
162#endif /* KERNEL */
163#endif /* _MACHINE_SMP_H_ */
171#endif /* SMP || APIC_IO */
172#endif /* KERNEL */
173#endif /* _MACHINE_SMP_H_ */