diff options
author | peter <peter@FreeBSD.org> | 2003-12-06 23:19:47 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2003-12-06 23:19:47 +0000 |
commit | e875083eeafdcb1031b930a65960415347bf6127 (patch) | |
tree | 77439996de9716cd52a55e7f02b8611fd949bf0e | |
parent | 09751b87c2960d25112bc75aa65de9b27e88dcbc (diff) | |
download | FreeBSD-src-e875083eeafdcb1031b930a65960415347bf6127.zip FreeBSD-src-e875083eeafdcb1031b930a65960415347bf6127.tar.gz |
Various whitespace and cosmetic sync-up's with i386.
Approved by: re (scottl)
-rw-r--r-- | sys/amd64/amd64/amd64-gdbstub.c | 6 | ||||
-rw-r--r-- | sys/amd64/amd64/amd64_mem.c | 1 | ||||
-rw-r--r-- | sys/amd64/amd64/apic_vector.S | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/fpu.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/machdep.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/mem.c | 5 | ||||
-rw-r--r-- | sys/amd64/amd64/nexus.c | 2 | ||||
-rw-r--r-- | sys/amd64/pci/pci_bus.c | 4 | ||||
-rw-r--r-- | sys/amd64/pci/pci_cfgreg.c | 1 |
9 files changed, 13 insertions, 12 deletions
diff --git a/sys/amd64/amd64/amd64-gdbstub.c b/sys/amd64/amd64/amd64-gdbstub.c index 39d9d75..ac001cd 100644 --- a/sys/amd64/amd64/amd64-gdbstub.c +++ b/sys/amd64/amd64/amd64-gdbstub.c @@ -12,6 +12,9 @@ ****************************************************************************/ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /**************************************************************************** * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ * @@ -92,9 +95,6 @@ * ****************************************************************************/ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/reboot.h> #include <sys/systm.h> diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c index f4a12e9..3a0d9b8 100644 --- a/sys/amd64/amd64/amd64_mem.c +++ b/sys/amd64/amd64/amd64_mem.c @@ -22,7 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include <sys/cdefs.h> diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index 2160dc4..11d5b60 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -104,13 +104,13 @@ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ PUSH_FRAME ; \ + FAKE_MCOUNT(13*4(%esp)) ; /* XXX avoid double count */ \ movq lapic, %rdx ; /* pointer to local APIC */ \ movl LA_ISR + 16 * (index)(%rdx), %eax ; /* load ISR */ \ bsrl %eax, %eax ; /* index of highset set bit in ISR */ \ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ - FAKE_MCOUNT(13*4(%esp)) ; /* XXX avoid double count */ \ movq %rax, %rdi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 1acb931..c5197b6 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)npx.c 7.2 (Berkeley) 5/12/91 + * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 */ #include <sys/cdefs.h> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 1e28aa9..0662e94 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)machdep.c 7.4 (Berkeley) 6/3/91 + * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ #include <sys/cdefs.h> diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index aeb2e35..c2c702f 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -36,8 +36,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Utah $Hdr: mem.c 1.13 89/10/08$ - * @(#)mem.c 7.2 (Berkeley) 5/9/91 + * from: Utah $Hdr: mem.c 1.13 89/10/08$ + * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 */ #include <sys/cdefs.h> @@ -175,6 +175,7 @@ kmemphys: } c = iov->iov_len; + /* * Make sure that all of the pages are currently resident so * that we don't create any zero-fill pages. diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c index f969c44..b6762f2 100644 --- a/sys/amd64/amd64/nexus.c +++ b/sys/amd64/amd64/nexus.c @@ -174,7 +174,7 @@ nexus_probe(device_t dev) if (last == -1) last = irq; } else if (last != -1) { - if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + if (rman_manage_region(&irq_rman, last, irq - 1) != 0) panic("nexus_probe irq_rman add"); last = -1; } diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index 6be70b7..af458ea 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.c @@ -84,8 +84,8 @@ legacy_pcib_route_interrupt(device_t pcib, device_t dev, int pin) static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, - u_int32_t id, u_int8_t class, u_int8_t subclass, - u_int8_t *busnum) + u_int32_t id, u_int8_t class, u_int8_t subclass, + u_int8_t *busnum) { const char *s = NULL; static u_int8_t pxb[4]; /* hack for 450nx */ diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index 6c381d8..817389c 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -346,3 +346,4 @@ pcireg_cfgopen(void) devmax = 0; return (cfgmech); } + |