Fri Jan 20 06:51:19 2012 UTC ()
Whitespace


(skrll)
diff -r1.67 -r1.68 src/sys/arch/hp700/include/cpu.h
cvs diff -r1.67 -r1.68 src/sys/arch/hp700/include/Attic/cpu.h (expand / switch to unified diff)

--- src/sys/arch/hp700/include/Attic/cpu.h 2012/01/20 06:50:00 1.67
+++ src/sys/arch/hp700/include/Attic/cpu.h 2012/01/20 06:51:19 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.h,v 1.67 2012/01/20 06:50:00 skrll Exp $ */ 1/* $NetBSD: cpu.h,v 1.68 2012/01/20 06:51:19 skrll 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
@@ -264,27 +264,27 @@ struct cpu_info { @@ -264,27 +264,27 @@ struct cpu_info {
264 int ci_mtx_oldspl; 264 int ci_mtx_oldspl;
265 int ci_want_resched; 265 int ci_want_resched;
266 266
267 volatile int ci_cpl; 267 volatile int ci_cpl;
268 volatile int ci_ipending; /* The pending interrupts. */ 268 volatile int ci_ipending; /* The pending interrupts. */
269 u_int ci_intr_depth; /* Nonzero iff running an interrupt. */ 269 u_int ci_intr_depth; /* Nonzero iff running an interrupt. */
270 270
271 hppa_hpa_t ci_hpa; 271 hppa_hpa_t ci_hpa;
272 register_t ci_psw; /* Processor Status Word. */ 272 register_t ci_psw; /* Processor Status Word. */
273 paddr_t ci_fpu_state; /* LWP FPU state address, or zero. */ 273 paddr_t ci_fpu_state; /* LWP FPU state address, or zero. */
274 u_long ci_itmr; 274 u_long ci_itmr;
275 275
276#if defined(MULTIPROCESSOR) 276#if defined(MULTIPROCESSOR)
277 struct lwp *ci_curlwp; /* CPU owner */ 277 struct lwp *ci_curlwp; /* CPU owner */
278 paddr_t ci_stack; /* stack for spin up */ 278 paddr_t ci_stack; /* stack for spin up */
279 volatile int ci_flags; /* CPU status flags */ 279 volatile int ci_flags; /* CPU status flags */
280#define CPUF_PRIMARY 0x0001 /* ... is monarch/primary */ 280#define CPUF_PRIMARY 0x0001 /* ... is monarch/primary */
281#define CPUF_RUNNING 0x0002 /* ... is running. */ 281#define CPUF_RUNNING 0x0002 /* ... is running. */
282 282
283#endif 283#endif
284 284
285#endif /* !_KMEMUSER */ 285#endif /* !_KMEMUSER */
286} __aligned(64); 286} __aligned(64);
287 287
288#endif /* _KERNEL || _KMEMUSER */ 288#endif /* _KERNEL || _KMEMUSER */
289 289
290#if defined(_KERNEL) 290#if defined(_KERNEL)