← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to target-ppc/translate_init.c

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
target-ppc/translate_init.c
9483
9483
    env->mmu_model = def->mmu_model;
9484
9484
    env->excp_model = def->excp_model;
9485
9485
    env->bus_model = def->bus_model;
 
9486
    env->insns_flags = def->insns_flags;
9486
9487
    env->flags = def->flags;
9487
9488
    env->bfd_mach = def->bfd_mach;
9488
9489
    env->check_pow = def->check_pow;