summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
Diffstat (limited to 'i386')
-rw-r--r--i386/Files1
-rw-r--r--i386/i386/pit.h6
-rw-r--r--i386/i386at/model_dep.c7
-rw-r--r--i386/linux/Makefile.in6
4 files changed, 13 insertions, 7 deletions
diff --git a/i386/Files b/i386/Files
index 438a583..3cd5f49 100644
--- a/i386/Files
+++ b/i386/Files
@@ -248,7 +248,6 @@ i386/include/mach/i386/vm_param.h
i386/include/mach/i386/vm_types.h
i386/include/mach/i386/exec/elf.h
i386/include/mach/sa/stdarg.h
-i386/include/mach/sa/sys/varargs.h
i386/intel/pmap.c
i386/intel/pmap.h
i386/intel/read_fault.c
diff --git a/i386/i386/pit.h b/i386/i386/pit.h
index 3cadb30..79a8757 100644
--- a/i386/i386/pit.h
+++ b/i386/i386/pit.h
@@ -100,8 +100,10 @@ typedef struct time_latch {
time_t ticks; /* time in HZ since boot */
time_t uticks; /* time in 1.25 MHZ */
/* don't need these two for now. --- csy */
-/* time_t secs; /* seconds since boot */
-/* time_t epochsecs; /* seconds since epoch */
+#if 0
+ time_t secs; /* seconds since boot */
+ time_t epochsecs; /* seconds since epoch */
+#endif
} time_latch;
/* a couple in-line assembly codes for efficiency. */
asm int intr_disable()
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index cddbf26..21f0785 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -98,6 +98,9 @@ extern char version[];
extern void setup_main();
+void halt_all_cpu (boolean_t reboot) __attribute__ ((noreturn));
+void halt_cpu (void) __attribute__ ((noreturn));
+
void inittodr(); /* forward */
int rebootflag = 0; /* exported to kdintr */
@@ -155,7 +158,7 @@ void machine_init()
/*
* Halt a cpu.
*/
-halt_cpu()
+void halt_cpu(void)
{
asm volatile("cli");
while(1);
@@ -164,7 +167,7 @@ halt_cpu()
/*
* Halt the system or reboot.
*/
-halt_all_cpus(reboot)
+void halt_all_cpus(reboot)
boolean_t reboot;
{
if (reboot) {
diff --git a/i386/linux/Makefile.in b/i386/linux/Makefile.in
index 80d008d..2d7d3a6 100644
--- a/i386/linux/Makefile.in
+++ b/i386/linux/Makefile.in
@@ -31,7 +31,7 @@ CFLAGS = @CFLAGS@
# Files for driver support.
-linux-c-files = version.c softirq.c dma.c resource.c printk.c \
+linux-c-files = version.c softirq.c delay.c dma.c resource.c printk.c \
bios32.c irq.c ctype.c vsprintf.c main.c misc.c sched.c \
kmem.c block.c setup.c
@@ -39,6 +39,7 @@ linux-c-files = version.c softirq.c dma.c resource.c printk.c \
vpath %.c $(linuxsrcdir)/dev/kernel
vpath %.c $(linuxsrcdir)/dev/init
vpath %.c $(linuxsrcdir)/dev/arch/$(systype)/kernel
+vpath %.c $(linuxsrcdir)/dev/arch/$(systype)/lib
vpath %.c $(linuxsrcdir)/dev/glue
vpath %.c $(linuxsrcdir)/dev/lib
@@ -46,11 +47,12 @@ vpath %.c $(linuxsrcdir)/dev/lib
vpath %.c $(linuxsrcdir)/src/kernel
vpath %.c $(linuxsrcdir)/src/init
vpath %.c $(linuxsrcdir)/src/arch/$(systype)/kernel
+vpath %.c $(linuxsrcdir)/src/arch/$(systype)/lib
vpath %.c $(linuxsrcdir)/src/lib
# XXX: Assembly source files must be treated separately... Uggg...
-linux-asm-files = delay.S semaphore.S
+linux-asm-files = semaphore.S
vpath %.S $(linuxsrcdir)/dev/arch/$(systype)/lib
vpath %.S $(linuxsrcdir)/src/arch/$(systype)/lib