Merge tag 'ntb-4.13' of git://github.com/jonmason/ntb

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / asm-offsets.c

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index ae8e89e0d0836274b07377ed8668332d83f648e1..6e95c2c19a7e0fb8906e3f33aacd54b79514f905 100644 (file)
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -100,12 +100,12 @@ int main(void)
        OFFSET(THREAD_NORMSAVES, thread_struct, normsave[0]);
 #endif
        OFFSET(THREAD_FPEXC_MODE, thread_struct, fpexc_mode);
-       OFFSET(THREAD_FPSTATE, thread_struct, fp_state);
+       OFFSET(THREAD_FPSTATE, thread_struct, fp_state.fpr);
        OFFSET(THREAD_FPSAVEAREA, thread_struct, fp_save_area);
        OFFSET(FPSTATE_FPSCR, thread_fp_state, fpscr);
        OFFSET(THREAD_LOAD_FP, thread_struct, load_fp);
 #ifdef CONFIG_ALTIVEC
-       OFFSET(THREAD_VRSTATE, thread_struct, vr_state);
+       OFFSET(THREAD_VRSTATE, thread_struct, vr_state.vr);
        OFFSET(THREAD_VRSAVEAREA, thread_struct, vr_save_area);
        OFFSET(THREAD_VRSAVE, thread_struct, vrsave);
        OFFSET(THREAD_USED_VR, thread_struct, used_vr);
@@ -145,9 +145,9 @@ int main(void)
        OFFSET(THREAD_TM_PPR, thread_struct, tm_ppr);
        OFFSET(THREAD_TM_DSCR, thread_struct, tm_dscr);
        OFFSET(PT_CKPT_REGS, thread_struct, ckpt_regs);
-       OFFSET(THREAD_CKVRSTATE, thread_struct, ckvr_state);
+       OFFSET(THREAD_CKVRSTATE, thread_struct, ckvr_state.vr);
        OFFSET(THREAD_CKVRSAVE, thread_struct, ckvrsave);
-       OFFSET(THREAD_CKFPSTATE, thread_struct, ckfp_state);
+       OFFSET(THREAD_CKFPSTATE, thread_struct, ckfp_state.fpr);
        /* Local pt_regs on stack for Transactional Memory funcs. */
        DEFINE(TM_FRAME_SIZE, STACK_FRAME_OVERHEAD +
               sizeof(struct pt_regs) + 16);
@@ -745,9 +745,11 @@ int main(void)
        OFFSET(PACA_THREAD_MASK, paca_struct, thread_mask);
        OFFSET(PACA_SUBCORE_SIBLING_MASK, paca_struct, subcore_sibling_mask);
        OFFSET(PACA_SIBLING_PACA_PTRS, paca_struct, thread_sibling_pacas);
+       OFFSET(PACA_REQ_PSSCR, paca_struct, requested_psscr);
 #endif
 
        DEFINE(PPC_DBELL_SERVER, PPC_DBELL_SERVER);
+       DEFINE(PPC_DBELL_MSGTYPE, PPC_DBELL_MSGTYPE);
 
 #ifdef CONFIG_PPC_8xx
        DEFINE(VIRT_IMMR_BASE, (u64)__fix_to_virt(FIX_IMMR_BASE));