| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | /* $NetBSD: cpu.h,v 1.7 2019/12/04 07:49:39 skrll Exp $ */ | | 1 | /* $NetBSD: cpu.h,v 1.8 2019/12/05 03:59:39 riastradh Exp $ */ |
| 2 | | | 2 | |
| 3 | /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ | | 3 | /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ |
| 4 | | | 4 | |
| 5 | /* | | 5 | /* |
| 6 | * Copyright (c) 2000-2004 Michael Shalayeff | | 6 | * Copyright (c) 2000-2004 Michael Shalayeff |
| 7 | * All rights reserved. | | 7 | * All rights reserved. |
| 8 | * | | 8 | * |
| 9 | * Redistribution and use in source and binary forms, with or without | | 9 | * Redistribution and use in source and binary forms, with or without |
| 10 | * modification, are permitted provided that the following conditions | | 10 | * modification, are permitted provided that the following conditions |
| 11 | * are met: | | 11 | * are met: |
| 12 | * 1. Redistributions of source code must retain the above copyright | | 12 | * 1. Redistributions of source code must retain the above copyright |
| 13 | * notice, this list of conditions and the following disclaimer. | | 13 | * notice, this list of conditions and the following disclaimer. |
| 14 | * 2. Redistributions in binary form must reproduce the above copyright | | 14 | * 2. Redistributions in binary form must reproduce the above copyright |
| @@ -37,27 +37,27 @@ | | | @@ -37,27 +37,27 @@ |
| 37 | * and disclaimer notices, and (2) redistributions including binaries | | 37 | * and disclaimer notices, and (2) redistributions including binaries |
| 38 | * reproduce the notices in supporting documentation, and (3) all advertising | | 38 | * reproduce the notices in supporting documentation, and (3) all advertising |
| 39 | * materials mentioning features or use of this software display the following | | 39 | * materials mentioning features or use of this software display the following |
| 40 | * acknowledgement: ``This product includes software developed by the | | 40 | * acknowledgement: ``This product includes software developed by the |
| 41 | * Computer Systems Laboratory at the University of Utah.'' | | 41 | * Computer Systems Laboratory at the University of Utah.'' |
| 42 | * | | 42 | * |
| 43 | * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS | | 43 | * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS |
| 44 | * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF | | 44 | * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF |
| 45 | * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. | | 45 | * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. |
| 46 | * | | 46 | * |
| 47 | * CSL requests users of this software to return to csl-dist@cs.utah.edu any | | 47 | * CSL requests users of this software to return to csl-dist@cs.utah.edu any |
| 48 | * improvements that they make and grant CSL redistribution rights. | | 48 | * improvements that they make and grant CSL redistribution rights. |
| 49 | * | | 49 | * |
| 50 | * Utah $Hdr: cpu.h 1.19 94/12/16$ | | 50 | * Utah $Hdr$ |
| 51 | */ | | 51 | */ |
| 52 | | | 52 | |
| 53 | #ifndef _MACHINE_CPU_H_ | | 53 | #ifndef _MACHINE_CPU_H_ |
| 54 | #define _MACHINE_CPU_H_ | | 54 | #define _MACHINE_CPU_H_ |
| 55 | | | 55 | |
| 56 | #ifdef _KERNEL_OPT | | 56 | #ifdef _KERNEL_OPT |
| 57 | #include "opt_cputype.h" | | 57 | #include "opt_cputype.h" |
| 58 | #include "opt_multiprocessor.h" | | 58 | #include "opt_multiprocessor.h" |
| 59 | #endif | | 59 | #endif |
| 60 | | | 60 | |
| 61 | #include <machine/trap.h> | | 61 | #include <machine/trap.h> |
| 62 | #include <machine/frame.h> | | 62 | #include <machine/frame.h> |
| 63 | #include <machine/reg.h> | | 63 | #include <machine/reg.h> |
| @@ -286,27 +286,26 @@ struct cpu_info { | | | @@ -286,27 +286,26 @@ struct cpu_info { |
| 286 | u_int ci_imask[NIPL]; | | 286 | u_int ci_imask[NIPL]; |
| 287 | | | 287 | |
| 288 | struct hppa_interrupt_register ci_ir; | | 288 | struct hppa_interrupt_register ci_ir; |
| 289 | struct hppa_interrupt_bit ci_ib[HPPA_INTERRUPT_BITS]; | | 289 | struct hppa_interrupt_bit ci_ib[HPPA_INTERRUPT_BITS]; |
| 290 | | | 290 | |
| 291 | struct lwp *ci_onproc; /* current user LWP / kthread */ | | 291 | struct lwp *ci_onproc; /* current user LWP / kthread */ |
| 292 | #if defined(MULTIPROCESSOR) | | 292 | #if defined(MULTIPROCESSOR) |
| 293 | struct lwp *ci_curlwp; /* CPU owner */ | | 293 | struct lwp *ci_curlwp; /* CPU owner */ |
| 294 | paddr_t ci_stack; /* stack for spin up */ | | 294 | paddr_t ci_stack; /* stack for spin up */ |
| 295 | volatile int ci_flags; /* CPU status flags */ | | 295 | volatile int ci_flags; /* CPU status flags */ |
| 296 | #define CPUF_PRIMARY 0x0001 /* ... is monarch/primary */ | | 296 | #define CPUF_PRIMARY 0x0001 /* ... is monarch/primary */ |
| 297 | #define CPUF_RUNNING 0x0002 /* ... is running. */ | | 297 | #define CPUF_RUNNING 0x0002 /* ... is running. */ |
| 298 | | | 298 | |
| 299 | struct lwp *ci_onproc; /* current user LWP / kthread */ | | | |
| 300 | volatile u_long ci_ipi; /* IPIs pending */ | | 299 | volatile u_long ci_ipi; /* IPIs pending */ |
| 301 | | | 300 | |
| 302 | struct cpu_softc *ci_softc; | | 301 | struct cpu_softc *ci_softc; |
| 303 | #endif | | 302 | #endif |
| 304 | | | 303 | |
| 305 | #endif /* !_KMEMUSER */ | | 304 | #endif /* !_KMEMUSER */ |
| 306 | } __aligned(64); | | 305 | } __aligned(64); |
| 307 | | | 306 | |
| 308 | #endif /* _KERNEL || _KMEMUSER */ | | 307 | #endif /* _KERNEL || _KMEMUSER */ |
| 309 | #endif /* __ASSEMBLER__ */ | | 308 | #endif /* __ASSEMBLER__ */ |
| 310 | | | 309 | |
| 311 | #if defined(_KERNEL) | | 310 | #if defined(_KERNEL) |
| 312 | | | 311 | |