diff options
| author | Anthony Liguori | 2013-07-29 14:30:06 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-07-29 14:30:06 +0200 |
| commit | f60a0d6ab9ea9ba900ba3936c3471851f28f7bc4 (patch) | |
| tree | dea3333d37675077086d1285ce94626420aed56b /include/exec | |
| parent | Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging (diff) | |
| parent | w32, w64: Add build rule for installer (diff) | |
| download | qemu-f60a0d6ab9ea9ba900ba3936c3471851f28f7bc4.tar.gz qemu-f60a0d6ab9ea9ba900ba3936c3471851f28f7bc4.tar.xz qemu-f60a0d6ab9ea9ba900ba3936c3471851f28f7bc4.zip | |
Merge remote-tracking branch 'sweil/w32' into staging
# By Stefan Weil (10) and others
# Via Aurelien Jarno (1) and Stefan Weil (1)
* sweil/w32: (27 commits)
w32, w64: Add build rule for installer
target-mips: fix mipsdsp_mul_q31_q31
mips_malta: fix copy of the 0x1fc00000 region
linux-user: correct argument number for sys_mremap and sys_splice
target-mips: Remove assignment to a variable which is never used
target-mips: fix mipsdsp_trunc16_sat16_round
hw/mips: align initrd to 64KB to avoid kernel error
pflash_cfi01: duplicate status byte from bits 23:16 for 32bit reads
mips_malta: generate SMBUS EEPROM data
mips_malta: cap BIOS endian swap length at 0x3e0000 bytes
mips_malta: generate SPD EEPROM data at runtime
mips_malta: correct reading MIPS revision at 0x1fc00010
mips_malta: fix BIOS endianness swapping
mips_malta: QOM cast cleanup
target-mips: fix branch in likely delay slot tcg assert
target-mips: fix multiplication in mipsdsp_rndq15_mul_q15_q15
target-mips: Remove assignment to a variable which is never used
misc: Use g_assert_not_reached for code which is expected to be unreachable
qemu-options: mention C-a h in the -nographic doc
misc: Fix new typos in comments and strings
...
Message-id: 1374989579-24933-1-git-send-email-sw@weilnetz.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/poison.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/exec/poison.h b/include/exec/poison.h index 2341a75041..a4b1eca24f 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -36,7 +36,6 @@ #pragma GCC poison TARGET_PAGE_ALIGN #pragma GCC poison CPUArchState -#pragma GCC poison env #pragma GCC poison lduw_phys #pragma GCC poison ldl_phys |