Module Name: src
Committed By: maya
Date: Sat Apr 13 21:39:46 UTC 2019
Modified Files:
src/sys/arch/mips/mips: cache_octeon.c
Log Message:
Remove unused declaration of __BIT and __BITS
it's defined already, tested with #error.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/cache_octeon.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/mips/mips/cache_octeon.c
diff -u src/sys/arch/mips/mips/cache_octeon.c:1.2 src/sys/arch/mips/mips/cache_octeon.c:1.3
--- src/sys/arch/mips/mips/cache_octeon.c:1.2 Mon Jul 11 16:15:36 2016
+++ src/sys/arch/mips/mips/cache_octeon.c Sat Apr 13 21:39:46 2019
@@ -1,7 +1,7 @@
-/* $NetBSD: cache_octeon.c,v 1.2 2016/07/11 16:15:36 matt Exp $ */
+/* $NetBSD: cache_octeon.c,v 1.3 2019/04/13 21:39:46 maya Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache_octeon.c,v 1.2 2016/07/11 16:15:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache_octeon.c,v 1.3 2019/04/13 21:39:46 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,16 +98,6 @@ octeon_pdcache_inv_range_index(vaddr_t v
#ifdef OCTEON_ICACHE_DEBUG
-#ifndef __BIT
-/* __BIT(n): nth bit, where __BIT(0) == 0x1. */
-#define __BIT(__n) \
- (((__n) >= NBBY * sizeof(uintmax_t)) ? 0 : ((uintmax_t)1 << (__n)))
-
-/* __BITS(m, n): bits m through n, m < n. */
-#define __BITS(__m, __n) \
- ((__BIT(MAX((__m), (__n)) + 1) - 1) ^ (__BIT(MIN((__m), (__n))) - 1))
-#endif
-
/* icache: 16KB, 2ways */
#define OCTEON_ICACHE_VA_WAY(_va) (((_va) & __BITS(14, 13)) >> 13)
