[src/netbsd-9]: src/sys/arch/powerpc/ibm4xx Pull up following revision(s) (re...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a6c9f7010f05
branches:  netbsd-9
changeset: 963699:a6c9f7010f05
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Mar 09 10:37:57 2020 +0000

description:
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.

diffstat:

 sys/arch/powerpc/ibm4xx/cpu.c     |   6 +++---
 sys/arch/powerpc/ibm4xx/pic_uic.c |  10 ++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diffs (57 lines):

diff -r a61e6ad75ca7 -r a6c9f7010f05 sys/arch/powerpc/ibm4xx/cpu.c
--- a/sys/arch/powerpc/ibm4xx/cpu.c     Mon Mar 09 10:36:42 2020 +0000
+++ b/sys/arch/powerpc/ibm4xx/cpu.c     Mon Mar 09 10:37:57 2020 +0000
@@ -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 @@
                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" : : );
        }
 }
diff -r a61e6ad75ca7 -r a6c9f7010f05 sys/arch/powerpc/ibm4xx/pic_uic.c
--- a/sys/arch/powerpc/ibm4xx/pic_uic.c Mon Mar 09 10:36:42 2020 +0000
+++ b/sys/arch/powerpc/ibm4xx/pic_uic.c Mon Mar 09 10:37:57 2020 +0000
@@ -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 @@
 #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.
  */