From owner-svn-src-all@freebsd.org Wed Sep 21 22:09:18 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 656C6BE4242; Wed, 21 Sep 2016 22:09:18 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38331B91; Wed, 21 Sep 2016 22:09:18 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8LM9HDN069282; Wed, 21 Sep 2016 22:09:17 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LM9H3Q069281; Wed, 21 Sep 2016 22:09:17 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201609212209.u8LM9H3Q069281@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 21 Sep 2016 22:09:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r306147 - head/sys/powerpc/ofw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Sep 2016 22:09:18 -0000 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);