From 3aed12bd06cd75bc6c1033bc5443d37113113563 Mon Sep 17 00:00:00 2001 From: veego Date: Tue, 10 Jun 1997 19:48:33 +0000 Subject: [PATCH] Delete _btos and _stob. The remaining 'Mach derived conversion macros' are now in --- sys/arch/sun3/include/pte3x.h | 17 ++--------------- sys/arch/sun3x/include/pte.h | 17 ++--------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/sys/arch/sun3/include/pte3x.h b/sys/arch/sun3/include/pte3x.h index 88030b1b0e31..4add0e288dab 100644 --- a/sys/arch/sun3/include/pte3x.h +++ b/sys/arch/sun3/include/pte3x.h @@ -1,4 +1,4 @@ -/* $NetBSD: pte3x.h,v 1.5 1997/05/14 01:37:24 jeremy Exp $ */ +/* $NetBSD: pte3x.h,v 1.6 1997/06/10 19:48:33 veego Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ * Rounding macros. * The MMU_ROUND macros are named misleadingly. MMU_ROUND_A actually * rounds an address to the nearest B table boundary, and so on. - * MMU_ROUND_C() is synonmous with _round_page(). + * MMU_ROUND_C() is synonmous with m68k_round_page(). */ #define MMU_ROUND_A(pa)\ ((unsigned long) (pa) & MMU_TIA_MASK) @@ -141,19 +141,6 @@ #define PA_PGNUM(pa) ((unsigned)pa >> PGSHIFT) -/* - * Mach derived conversion macros - */ -#define _round_seg(x) ((((unsigned)(x)) + SEGOFSET) & ~SEGOFSET) -#define _trunc_seg(x) ((unsigned)(x) & ~SEGOFSET) -#define _btos(x) ((unsigned)(x) >> SEGSHIFT) -#define _stob(x) ((unsigned)(x) << SEGSHIFT) - -#define _round_page(x) ((((unsigned)(x)) + PGOFSET) & ~PGOFSET) -#define _trunc_page(x) ((unsigned)(x) & ~PGOFSET) -#define _btop(x) ((unsigned)(x) >> PGSHIFT) -#define _ptob(x) ((unsigned)(x) << PGSHIFT) - #ifdef _KERNEL /* defined in pmap.c */ diff --git a/sys/arch/sun3x/include/pte.h b/sys/arch/sun3x/include/pte.h index 31fff8656d8a..7b77e2ee0c02 100644 --- a/sys/arch/sun3x/include/pte.h +++ b/sys/arch/sun3x/include/pte.h @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.5 1997/05/14 01:37:24 jeremy Exp $ */ +/* $NetBSD: pte.h,v 1.6 1997/06/10 19:48:33 veego Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ * Rounding macros. * The MMU_ROUND macros are named misleadingly. MMU_ROUND_A actually * rounds an address to the nearest B table boundary, and so on. - * MMU_ROUND_C() is synonmous with _round_page(). + * MMU_ROUND_C() is synonmous with m68k_round_page(). */ #define MMU_ROUND_A(pa)\ ((unsigned long) (pa) & MMU_TIA_MASK) @@ -141,19 +141,6 @@ #define PA_PGNUM(pa) ((unsigned)pa >> PGSHIFT) -/* - * Mach derived conversion macros - */ -#define _round_seg(x) ((((unsigned)(x)) + SEGOFSET) & ~SEGOFSET) -#define _trunc_seg(x) ((unsigned)(x) & ~SEGOFSET) -#define _btos(x) ((unsigned)(x) >> SEGSHIFT) -#define _stob(x) ((unsigned)(x) << SEGSHIFT) - -#define _round_page(x) ((((unsigned)(x)) + PGOFSET) & ~PGOFSET) -#define _trunc_page(x) ((unsigned)(x) & ~PGOFSET) -#define _btop(x) ((unsigned)(x) >> PGSHIFT) -#define _ptob(x) ((unsigned)(x) << PGSHIFT) - #ifdef _KERNEL /* defined in pmap.c */