Author: jhibbits
Date: Wed Sep 21 22:09:17 2016
New Revision: 306147
URL: https://svnweb.freebsd.org/changeset/base/306147
Log:
Revert part of r306065
This is a separate change I was testing.
Modified:
head/sys/powerpc/ofw/ofw_machdep.c
Modified: head/sys/powerpc/ofw/ofw_machdep.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_machdep.c Wed Sep 21 21:42:06 2016
(r306146)
+++ head/sys/powerpc/ofw/ofw_machdep.c Wed Sep 21 22:09:17 2016
(r306147)
@@ -99,7 +99,6 @@ ofw_restore_trap_vec(char *restore_trap_
/*
* Saved SPRG0-3 from OpenFirmware. Will be restored prior to the callback.
*/
-#ifndef __powerpc64__
register_t ofw_sprg0_save;
static __inline void
@@ -141,8 +140,6 @@ ofw_sprg_restore(void)
}
#endif
-#endif
-
static int
parse_ofw_memory(phandle_t node, const char *prop, struct mem_region *output)
{
@@ -347,12 +344,11 @@ OF_initial_setup(void *fdt_ptr, void *ju
ofmsr[0] = mfmsr();
#ifdef __powerpc64__
ofmsr[0] &= ~PSL_SF;
- #else
+ #endif
__asm __volatile("mfsprg0 %0" : "=&r"(ofmsr[1]));
__asm __volatile("mfsprg1 %0" : "=&r"(ofmsr[2]));
__asm __volatile("mfsprg2 %0" : "=&r"(ofmsr[3]));
__asm __volatile("mfsprg3 %0" : "=&r"(ofmsr[4]));
- #endif
openfirmware_entry = openfirm;
if (ofmsr[0] & PSL_DR)
@@ -444,9 +440,7 @@ openfirmware_core(void *args)
*/
oldmsr = intr_disable();
-#ifndef __powerpc64__
ofw_sprg_prepare();
-#endif
/* Save trap vectors */
ofw_save_trap_vec(save_trap_of);
@@ -469,9 +463,7 @@ openfirmware_core(void *args)
/* Restore trap vecotrs */
ofw_restore_trap_vec(save_trap_of);
-#ifndef __powerpc64__
ofw_sprg_restore();
-#endif
intr_restore(oldmsr);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
