summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/fpu.c4
-rw-r--r--sys/amd64/amd64/tsc.c10
-rw-r--r--sys/amd64/include/clock.h4
-rw-r--r--sys/amd64/include/pmap.h3
-rw-r--r--sys/amd64/isa/clock.c10
-rw-r--r--sys/amd64/isa/npx.c4
-rw-r--r--sys/amd64/pci/pci_bus.c4
-rw-r--r--sys/amd64/pci/pci_cfgreg.c4
8 files changed, 20 insertions, 23 deletions
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index ccfef1b..54cb5bf 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.24 1995/09/19 18:55:14 bde Exp $
+ * $Id: npx.c,v 1.25 1995/10/28 13:07:21 phk Exp $
*/
#include "npx.h"
@@ -111,7 +111,7 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
CTLFLAG_RD, &hw_float, 0,
"Floatingpoint instructions executed in hardware");
-u_int npx0_imask = SWI_CLOCK_MASK;
+static u_int npx0_imask = SWI_CLOCK_MASK;
struct proc *npxproc;
static bool_t npx_ex16;
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 82e0b18..86a1eec 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.38 1995/10/28 15:38:49 phk Exp $
+ * $Id: clock.c,v 1.39 1995/11/29 19:57:22 wollman Exp $
*/
/*
@@ -130,7 +130,7 @@ clkintr(struct clockframe frame)
setdelayed();
}
#else
-void
+static void
clkintr(struct clockframe frame)
{
timer_func(&frame);
@@ -245,7 +245,7 @@ release_timer2()
* The RTC chip requires that we read status register C (RTC_INTR)
* to acknowledge an interrupt, before it will generate the next one.
*/
-void
+static void
rtcintr(struct clockframe frame)
{
u_char stat;
@@ -256,8 +256,8 @@ rtcintr(struct clockframe frame)
}
#ifdef DDB
-static void
-printrtc(void)
+void
+DDB_printrtc(void)
{
printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n",
rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY),
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index c231f5e..542e628 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $Id$
+ * $Id: clock.h,v 1.6 1995/11/29 19:57:16 wollman Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -66,8 +66,6 @@ extern u_int timer0_prescaler_count;
#ifdef I586_CPU
void calibrate_cyclecounter __P((void));
#endif
-void clkintr __P((struct clockframe frame));
-void rtcintr __P((struct clockframe frame));
#ifdef I586_CPU
static __inline u_long
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index ed000e1..fa91bff 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -42,7 +42,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $Id: pmap.h,v 1.28 1995/07/19 06:37:12 davidg Exp $
+ * $Id: pmap.h,v 1.29 1995/12/03 18:37:44 bde Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -209,7 +209,6 @@ void pmap_activate __P((pmap_t, struct pcb *));
pmap_t pmap_kernel __P((void));
boolean_t pmap_page_exists __P((pmap_t, vm_offset_t));
pt_entry_t * __pure pmap_pte __P((pmap_t, vm_offset_t)) __pure2;
-vm_page_t pmap_pte_vm_page __P((pmap_t, vm_offset_t));
void *pmap_mapdev __P((vm_offset_t, vm_size_t));
void pmap_growkernel __P((vm_offset_t));
void pmap_bootstrap __P(( vm_offset_t, vm_offset_t));
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 82e0b18..86a1eec 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.38 1995/10/28 15:38:49 phk Exp $
+ * $Id: clock.c,v 1.39 1995/11/29 19:57:22 wollman Exp $
*/
/*
@@ -130,7 +130,7 @@ clkintr(struct clockframe frame)
setdelayed();
}
#else
-void
+static void
clkintr(struct clockframe frame)
{
timer_func(&frame);
@@ -245,7 +245,7 @@ release_timer2()
* The RTC chip requires that we read status register C (RTC_INTR)
* to acknowledge an interrupt, before it will generate the next one.
*/
-void
+static void
rtcintr(struct clockframe frame)
{
u_char stat;
@@ -256,8 +256,8 @@ rtcintr(struct clockframe frame)
}
#ifdef DDB
-static void
-printrtc(void)
+void
+DDB_printrtc(void)
{
printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n",
rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY),
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index ccfef1b..54cb5bf 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.24 1995/09/19 18:55:14 bde Exp $
+ * $Id: npx.c,v 1.25 1995/10/28 13:07:21 phk Exp $
*/
#include "npx.h"
@@ -111,7 +111,7 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
CTLFLAG_RD, &hw_float, 0,
"Floatingpoint instructions executed in hardware");
-u_int npx0_imask = SWI_CLOCK_MASK;
+static u_int npx0_imask = SWI_CLOCK_MASK;
struct proc *npxproc;
static bool_t npx_ex16;
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 1832320..ea6fb5f 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcibus.c,v 1.18 1995/10/17 15:23:14 se Exp $
+** $Id: pcibus.c,v 1.19 1995/10/17 23:30:11 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@@ -113,7 +113,7 @@ pcibus_imask_include (int irq, unsigned* maskptr);
static int
pcibus_imask_exclude (int irq, unsigned* maskptr);
-struct pcibus i386pci = {
+static struct pcibus i386pci = {
"pci",
pcibus_setup,
pcibus_tag,
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 1832320..ea6fb5f 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcibus.c,v 1.18 1995/10/17 15:23:14 se Exp $
+** $Id: pcibus.c,v 1.19 1995/10/17 23:30:11 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@@ -113,7 +113,7 @@ pcibus_imask_include (int irq, unsigned* maskptr);
static int
pcibus_imask_exclude (int irq, unsigned* maskptr);
-struct pcibus i386pci = {
+static struct pcibus i386pci = {
"pci",
pcibus_setup,
pcibus_tag,
OpenPOWER on IntegriCloud