From owner-p4-projects@FreeBSD.ORG Sun Apr 27 20:32:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 325EF37B40F; Sun, 27 Apr 2003 20:32:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07A4937B405 for ; Sun, 27 Apr 2003 20:32:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C31243FBF for ; Sun, 27 Apr 2003 20:32:29 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3S3WT0U085643 for ; Sun, 27 Apr 2003 20:32:29 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S3WS2u085635 for perforce@freebsd.org; Sun, 27 Apr 2003 20:32:28 -0700 (PDT) Date: Sun, 27 Apr 2003 20:32:28 -0700 (PDT) Message-Id: <200304280332.h3S3WS2u085635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Apr 2003 03:32:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=29923 Change 29923 by jmallett@jmallett_dalek on 2003/04/27 20:32:21 We -DLOCORE not -D_LOCORE. Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#6 edit .. //depot/projects/mips/sys/mips/include/endian.h#3 edit .. //depot/projects/mips/sys/mips/include/pte.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#6 (text+ko) ==== @@ -75,7 +75,7 @@ return (++now); } -#ifndef _LOCORE +#ifndef LOCORE /* XXX simonb * Should the following be in a cpu_info type structure? * And how many of these are per-cpu vs. per-system? (Ie, ==== //depot/projects/mips/sys/mips/include/endian.h#3 (text+ko) ==== @@ -39,7 +39,9 @@ #define _MACHINE_ENDIAN_H_ #include +#ifndef LOCORE #include +#endif #ifdef _KERNEL #include "opt_endian.h" @@ -86,6 +88,7 @@ #define BYTE_ORDER _BYTE_ORDER #endif +#ifndef LOCORE #ifdef __GNUC__ static __inline __uint16_t @@ -128,5 +131,6 @@ #define _BYTEORDER_FUNC_DEFINED #endif /* __GNUC__ */ +#endif #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/mips/sys/mips/include/pte.h#2 (text+ko) ==== @@ -99,7 +99,7 @@ * R4000 hardware page table entry */ -#ifndef _LOCORE +#ifndef LOCORE struct mips3_pte { #if BYTE_ORDER == BIG_ENDIAN unsigned int pg_prot:2, /* SW: access control */ @@ -129,7 +129,7 @@ int tlb_lo0; /* XXX maybe 64 bits (only 32 really used) */ int tlb_lo1; /* XXX maybe 64 bits (only 32 really used) */ }; -#endif /* _LOCORE */ +#endif /* LOCORE */ #define MIPS3_PG_WIRED 0x80000000 /* SW */ #define MIPS3_PG_RO 0x40000000 /* SW */ @@ -199,7 +199,7 @@ #define PG_ASID 0x000000ff /* Address space ID */ -#ifndef _LOCORE +#ifndef LOCORE #include typedef union pt_entry { @@ -227,9 +227,9 @@ #define mips_tlbpfn_to_paddr(x) mips3_tlbpfn_to_paddr((vaddr_t)(x)) #define mips_paddr_to_tlbpfn(x) mips3_paddr_to_tlbpfn((x)) -#endif /* ! _LOCORE */ +#endif /* ! LOCORE */ -#if defined(_KERNEL) && !defined(_LOCORE) +#if defined(_KERNEL) && !defined(LOCORE) /* * Kernel virtual address to page table entry and visa versa. */ @@ -240,5 +240,5 @@ extern pt_entry_t *kptemap; /* kernel pte table */ extern vm_size_t kptemapsize; /* number of pte's in Sysmap */ -#endif /* defined(_KERNEL) && !defined(_LOCORE) */ +#endif /* defined(_KERNEL) && !defined(LOCORE) */ #endif /* __MIPS_PTE_H__ */