Module Name: src
Committed By: martin
Date: Mon Mar 9 10:37:57 UTC 2020
Modified Files:
src/sys/arch/powerpc/ibm4xx [netbsd-9]: cpu.c pic_uic.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #774):
sys/arch/powerpc/ibm4xx/cpu.c: revision 1.34
sys/arch/powerpc/ibm4xx/pic_uic.c: revision 1.5
Cosmetic change. No binary changes.
Remove unused macros.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.34.1 src/sys/arch/powerpc/ibm4xx/cpu.c
cvs rdiff -u -r1.4 -r1.4.34.1 src/sys/arch/powerpc/ibm4xx/pic_uic.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/powerpc/ibm4xx/cpu.c
diff -u src/sys/arch/powerpc/ibm4xx/cpu.c:1.33 src/sys/arch/powerpc/ibm4xx/cpu.c:1.33.34.1
--- src/sys/arch/powerpc/ibm4xx/cpu.c:1.33 Mon Mar 24 19:29:59 2014
+++ src/sys/arch/powerpc/ibm4xx/cpu.c Mon Mar 9 10:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.33 2014/03/24 19:29:59 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.33.34.1 2020/03/09 10:37:57 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.33 2014/03/24 19:29:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.33.34.1 2020/03/09 10:37:57 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -317,6 +317,6 @@ dcache_wbinv_page(vaddr_t va)
for (size_t i = 0; i < PAGE_SIZE; i += dcache_line_size) {
__asm volatile("dcbf %0,%1" : : "b" (va), "r" (i));
}
- __asm volatile("sync;isync" : : );
+ __asm volatile("sync; isync" : : );
}
}
Index: src/sys/arch/powerpc/ibm4xx/pic_uic.c
diff -u src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.4 src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.4.34.1
--- src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.4 Tue Nov 19 12:46:43 2013
+++ src/sys/arch/powerpc/ibm4xx/pic_uic.c Mon Mar 9 10:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_uic.c,v 1.4 2013/11/19 12:46:43 kiyohara Exp $ */
+/* $NetBSD: pic_uic.c,v 1.4.34.1 2020/03/09 10:37:57 martin Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.4 2013/11/19 12:46:43 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.4.34.1 2020/03/09 10:37:57 martin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -295,12 +295,6 @@ struct pic_ops pic_uic2 = {
#endif /* MULTIUIC */
#endif /* !PPC_IBM403 */
-/* Write External Enable Immediate */
-#define wrteei(en) __asm volatile ("wrteei %0" : : "K"(en))
-
-/* Enforce In Order Execution of I/O */
-#define eieio() __asm volatile ("eieio")
-
/*
* Set up interrupt mapping array.
*/
