Module Name: src
Committed By: nonaka
Date: Tue May 23 03:23:58 UTC 2017
Modified Files:
src/sys/arch/x86/include: i82093var.h
src/sys/arch/x86/x86: lapic.c
Log Message:
whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/include/i82093var.h
cvs rdiff -u -r1.56 -r1.57 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/i82093var.h
diff -u src/sys/arch/x86/include/i82093var.h:1.15 src/sys/arch/x86/include/i82093var.h:1.16
--- src/sys/arch/x86/include/i82093var.h:1.15 Tue May 23 03:18:40 2017
+++ src/sys/arch/x86/include/i82093var.h Tue May 23 03:23:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: i82093var.h,v 1.15 2017/05/23 03:18:40 nonaka Exp $ */
+/* $NetBSD: i82093var.h,v 1.16 2017/05/23 03:23:58 nonaka Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,8 +37,7 @@
#include <sys/device.h>
#include <machine/apicvar.h>
-struct ioapic_pin
-{
+struct ioapic_pin {
struct ioapic_pin *ip_next; /* next pin on this vector */
struct mp_intr_map *ip_map;
int ip_vector; /* IDT vector */
@@ -52,7 +51,7 @@ struct ioapic_softc {
struct ioapic_softc *sc_next;
int sc_apic_vers;
int sc_apic_vecbase; /* global int base if ACPI */
- int sc_apic_sz; /* apic size*/
+ int sc_apic_sz; /* apic size */
int sc_flags;
paddr_t sc_pa; /* PA of ioapic */
volatile uint32_t *sc_reg; /* KVA of ioapic addr */
@@ -71,7 +70,7 @@ struct ioapic_softc {
* (ih&0x000ff80000000000)>>43 -> MSI/MSI-X device id.
* (ih&0x000007ff00000000)>>32 -> MSI/MSI-X vector id in a device.
*/
-#define MPSAFE_MASK 0x80000000ULL
+#define MPSAFE_MASK 0x80000000ULL
#define APIC_INT_VIA_APIC 0x10000000ULL
#define APIC_INT_VIA_MSI 0x20000000ULL
#define APIC_INT_APIC_MASK 0x00ff0000ULL
Index: src/sys/arch/x86/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.56 src/sys/arch/x86/x86/lapic.c:1.57
--- src/sys/arch/x86/x86/lapic.c:1.56 Sat Apr 22 04:29:31 2017
+++ src/sys/arch/x86/x86/lapic.c Tue May 23 03:23:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.56 2017/04/22 04:29:31 nonaka Exp $ */
+/* $NetBSD: lapic.c,v 1.57 2017/05/23 03:23:58 nonaka 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.56 2017/04/22 04:29:31 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.57 2017/05/23 03:23:58 nonaka Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -85,7 +85,7 @@ struct pic local_pic = {
.pic_lock = __SIMPLELOCK_UNLOCKED,
.pic_hwmask = lapic_hwmask,
.pic_hwunmask = lapic_hwunmask,
- .pic_addroute =lapic_setup,
+ .pic_addroute = lapic_setup,
.pic_delroute = lapic_setup,
};
