summaryrefslogtreecommitdiffstats
path: root/sys/sparc64/include
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2012-01-27 23:21:54 +0000
committermarius <marius@FreeBSD.org>2012-01-27 23:21:54 +0000
commit8ec59afebbf823ba6795829117afb053ca50b492 (patch)
tree2d3c370c551008867a633d7f4483d7ad889b7e18 /sys/sparc64/include
parent43204e516aa0f8eda375be7345dc4e05173ef657 (diff)
downloadFreeBSD-src-8ec59afebbf823ba6795829117afb053ca50b492.zip
FreeBSD-src-8ec59afebbf823ba6795829117afb053ca50b492.tar.gz
Now that we have a working OF_printf() since r230631 and a OF_panic()
helper since r230632, use these for output and panicing during the early cycles and move cninit() until after the static per-CPU data has been set up. This solves a couple of issue regarding the non- availability of the static per-CPU data: - panic() not working and only making things worse when called, - having to supply a special DELAY() implementation to the low-level console drivers, - curthread accesses of mutex(9) usage in low-level console drivers that aren't conditional due to compiler optimizations (basically, this is the problem described in r227537 but in this case for keyboards attached via uart(4)). [1] PR: 164123 [1]
Diffstat (limited to 'sys/sparc64/include')
-rw-r--r--sys/sparc64/include/clock.h30
1 files changed, 1 insertions, 29 deletions
diff --git a/sys/sparc64/include/clock.h b/sys/sparc64/include/clock.h
index fd57731..34b59d8 100644
--- a/sys/sparc64/include/clock.h
+++ b/sys/sparc64/include/clock.h
@@ -1,27 +1,5 @@
/*-
- * Copyright (c) 2001 Jake Burkholder.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * This file is in the public domain.
*
* $FreeBSD$
*/
@@ -29,10 +7,4 @@
#ifndef _MACHINE_CLOCK_H_
#define _MACHINE_CLOCK_H_
-extern void (*delay_func)(int usec);
-extern u_long clock_boot;
-
-void delay_boot(int usec);
-void delay_tick(int usec);
-
#endif /* !_MACHINE_CLOCK_H_ */
OpenPOWER on IntegriCloud