Thanks! Since PSL_HV is only defined on powerpc64, you also need some #ifdef here or the ppc32 kernel build will break. Also, the comment is longer than 80 characters.
-Nathan

On 01/30/18 22:42, Wojciech Macek wrote:
Author: wma
Date: Wed Jan 31 06:42:01 2018
New Revision: 328616
URL: https://svnweb.freebsd.org/changeset/base/328616

Log:
   PowerNV: fix compilation on non-NV platforms
Submitted by: Wojciech Macek <w...@semihalf.com>
   Obtained from:         Semihalf
   Sponsored by:          IBM, QCM Technologies

Modified:
   head/sys/powerpc/aim/mp_cpudep.c

Modified: head/sys/powerpc/aim/mp_cpudep.c
==============================================================================
--- head/sys/powerpc/aim/mp_cpudep.c    Wed Jan 31 05:07:43 2018        
(r328615)
+++ head/sys/powerpc/aim/mp_cpudep.c    Wed Jan 31 06:42:01 2018        
(r328616)
@@ -85,13 +85,15 @@ cpudep_ap_early_bootstrap(void)
                break;
        case IBMPOWER8:
        case IBMPOWER8E:
-               isync();
-               /* Direct interrupts to SRR instead of HSRR and reset LPCR 
otherwise */
-               mtspr(SPR_LPID, 0);
-               isync();
+               if (mfmsr() & PSL_HV) {
+                       isync();
+                       /* Direct interrupts to SRR instead of HSRR and reset 
LPCR otherwise */
+                       mtspr(SPR_LPID, 0);
+                       isync();
- mtspr(SPR_LPCR, LPCR_LPES);
-               isync();
+                       mtspr(SPR_LPCR, LPCR_LPES);
+                       isync();
+               }
                break;
        }

_______________________________________________
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"

Reply via email to