Module Name: src
Committed By: maxv
Date: Sun Dec 1 08:23:09 UTC 2019
Modified Files:
src/sys/arch/x86/include: i82489var.h
src/sys/arch/x86/x86: lapic.c
Log Message:
localify
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/include/i82489var.h
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/x86/x86/lapic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/i82489var.h
diff -u src/sys/arch/x86/include/i82489var.h:1.19 src/sys/arch/x86/include/i82489var.h:1.20
--- src/sys/arch/x86/include/i82489var.h:1.19 Tue May 23 08:54:39 2017
+++ src/sys/arch/x86/include/i82489var.h Sun Dec 1 08:23:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i82489var.h,v 1.19 2017/05/23 08:54:39 nonaka Exp $ */
+/* $NetBSD: i82489var.h,v 1.20 2019/12/01 08:23:09 maxv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -94,7 +94,6 @@ extern void lapic_initclocks(void);
extern uint32_t lapic_readreg(u_int);
extern void lapic_writereg(u_int, uint32_t);
extern void lapic_write_tpri(uint32_t);
-extern void lapic_eoi(void);
extern uint32_t lapic_cpu_number(void);
extern bool lapic_is_x2apic(void);
Index: src/sys/arch/x86/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.75 src/sys/arch/x86/x86/lapic.c:1.76
--- src/sys/arch/x86/x86/lapic.c:1.75 Fri Jun 14 09:23:42 2019
+++ src/sys/arch/x86/x86/lapic.c Sun Dec 1 08:23:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.75 2019/06/14 09:23:42 msaitoh Exp $ */
+/* $NetBSD: lapic.c,v 1.76 2019/12/01 08:23:09 maxv Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.75 2019/06/14 09:23:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.76 2019/12/01 08:23:09 maxv Exp $");
#include "acpica.h"
#include "ioapic.h"
@@ -206,12 +206,6 @@ lapic_write_tpri(uint32_t val)
#endif
}
-void
-lapic_eoi(void)
-{
- lapic_writereg(LAPIC_EOI, 0);
-}
-
uint32_t
lapic_cpu_number(void)
{
@@ -594,7 +588,7 @@ lapic_initclocks(void)
lapic_writereg(LAPIC_ICR_TIMER, lapic_tval);
lapic_writereg(LAPIC_LVT_TIMER,
LAPIC_LVT_TMM_PERIODIC | LAPIC_TIMER_VECTOR);
- lapic_eoi();
+ lapic_writereg(LAPIC_EOI, 0);
}
extern u_long rtclock_tval; /* XXX put in header file */
