diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-11-22 18:55:21 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-11-22 18:55:21 +0000 |
commit | b643f13842f1e7aa13af5f19ea33210a315f6807 (patch) | |
tree | 3a63cb9643bfb896fb03c0e2fa01813cf445b952 /sys | |
parent | 284eef7da9a2c48594537ef13da01c6a32788b7e (diff) |
{ on seperate line at start of function or I go crazy
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/amd64/amd64/ioapic.c | 5 | ||||
-rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 5 | ||||
-rw-r--r-- | sys/arch/i386/i386/ioapic.c | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/ioapic.c b/sys/arch/amd64/amd64/ioapic.c index 755e77aebd4..3815c2f2021 100644 --- a/sys/arch/amd64/amd64/ioapic.c +++ b/sys/arch/amd64/amd64/ioapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioapic.c,v 1.20 2010/08/08 16:43:21 deraadt Exp $ */ +/* $OpenBSD: ioapic.c,v 1.21 2014/11/22 18:55:20 deraadt Exp $ */ /* $NetBSD: ioapic.c,v 1.6 2003/05/15 13:30:31 fvdl Exp $ */ /*- @@ -254,7 +254,8 @@ ioapic_match(struct device *parent, void *v, void *aux) /* Reprogram the APIC ID, and check that it actually got set. */ void -ioapic_set_id(struct ioapic_softc *sc) { +ioapic_set_id(struct ioapic_softc *sc) +{ u_int8_t apic_id; ioapic_write(sc, IOAPIC_ID, diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 5edeba88c3e..f50d2e92ab8 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.197 2014/11/22 18:31:46 mlarkin Exp $ */ +/* $OpenBSD: machdep.c,v 1.198 2014/11/22 18:55:20 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1175,7 +1175,8 @@ cpu_init_extents(void) #if defined(MULTIPROCESSOR) || \ (NACPI > 0 && !defined(SMALL_KERNEL)) void -map_tramps(void) { +map_tramps(void) +{ struct pmap *kmp = pmap_kernel(); pmap_kenter_pa(lo32_vaddr, lo32_paddr, PROT_READ | PROT_WRITE); diff --git a/sys/arch/i386/i386/ioapic.c b/sys/arch/i386/i386/ioapic.c index 784933b42b7..803e44a2677 100644 --- a/sys/arch/i386/i386/ioapic.c +++ b/sys/arch/i386/i386/ioapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioapic.c,v 1.32 2014/07/17 12:56:07 dlg Exp $ */ +/* $OpenBSD: ioapic.c,v 1.33 2014/11/22 18:55:20 deraadt Exp $ */ /* $NetBSD: ioapic.c,v 1.7 2003/07/14 22:32:40 lukem Exp $ */ /*- @@ -259,7 +259,8 @@ ioapic_match(struct device *parent, void *v, void *aux) /* Reprogram the APIC ID, and check that it actually got set. */ void -ioapic_set_id(struct ioapic_softc *sc) { +ioapic_set_id(struct ioapic_softc *sc) +{ u_int8_t apic_id; ioapic_write(sc, IOAPIC_ID, @@ -828,7 +829,8 @@ apic_intr_disestablish(void *arg) } void -apic_stray(int irqnum) { +apic_stray(int irqnum) +{ unsigned int apicid; struct ioapic_softc *sc; |