Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git] / arch / x86 / platform / uv / tlb_uv.c
index 7d5d53f36a7abd90754edd64ce3b8edeb5651382..db77e087adaf874f6556f5f1d0cb5bdcaf54c42f 100644 (file)
@@ -1751,7 +1751,8 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode)
                uv1 = 1;
 
        /* the 14-bit pnode */
-       write_mmr_descriptor_base(pnode, (n << UV_DESC_PSHIFT | m));
+       write_mmr_descriptor_base(pnode,
+               (n << UVH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT | m));
        /*
         * Initializing all 8 (ITEMS_PER_DESC) descriptors for each
         * cpu even though we only use the first one; one descriptor can