diff options
| author | AlmuHS <almuhs@github.com> | 2019-04-15 17:05:00 +0200 |
|---|---|---|
| committer | AlmuHS <almuhs@github.com> | 2019-04-15 17:05:00 +0200 |
| commit | b900856b259c1903a07c17fd2ff89a17fd4cf11b (patch) | |
| tree | 4db5608e0b9245a6280b5b1664174c11dca9323a /kern | |
| parent | 8ebe488207ef8eb1898ad869fef654285a5cbf24 (diff) | |
undone latest changes
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/cpu_number.c | 2 | ||||
| -rw-r--r-- | kern/cpu_number.h | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/kern/cpu_number.c b/kern/cpu_number.c index 5c968d38..f1f205ef 100644 --- a/kern/cpu_number.c +++ b/kern/cpu_number.c @@ -9,7 +9,7 @@ int cpu_number() { if(ncpu == 1 | lapic == 0) return 0; - else{ + else{ unsigned apic_id = lapic->apic_id.r >>24; return apic2kernel[apic_id]; } diff --git a/kern/cpu_number.h b/kern/cpu_number.h index 04c7aba2..e86b8ee9 100644 --- a/kern/cpu_number.h +++ b/kern/cpu_number.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -34,7 +34,6 @@ */ extern unsigned int master_cpu; /* 'master' processor - keeps time */ -extern unsigned apic2kernel[NCPUS]; #if (NCPUS == 1) /* cpu number is always 0 on a single processor system */ |