Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[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 b14716bbb7b517eba9c44a6ab36c36046f862888..24d78e1871c9d5e9855e9aaddbf867d187fd697b 100644 (file)
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -726,12 +726,5 @@ int main(void)
                                        arch.timing_last_enter.tv32.tbl));
 #endif
 
-#ifdef CONFIG_PPC_POWERNV
-       DEFINE(OPAL_MC_GPR3, offsetof(struct opal_machine_check_event, gpr3));
-       DEFINE(OPAL_MC_SRR0, offsetof(struct opal_machine_check_event, srr0));
-       DEFINE(OPAL_MC_SRR1, offsetof(struct opal_machine_check_event, srr1));
-       DEFINE(PACA_OPAL_MC_EVT, offsetof(struct paca_struct, opal_mc_evt));
-#endif
-
        return 0;
 }