diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2013-07-29 09:03:23 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-07-29 09:03:23 +0200 |
| commit | 461bdb3414c40d6806194bf68c91521496b1042d (patch) | |
| tree | 8351478144c07306f24923791b1e4cd988770513 /include | |
| parent | b6a9f4682e62c686995cc1a1fe2ef4a57a92020b (diff) | |
| parent | 6c86f405efd6532b58ad1b607cc9f11e856ef5ca (diff) | |
| download | qemu-461bdb3414c40d6806194bf68c91521496b1042d.tar.gz | |
Merge branch 'trivial-patches' of git://git.corpit.ru/qemu
* 'trivial-patches' of git://git.corpit.ru/qemu:
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
linux-user: correct argument number for sys_mremap and sys_splice
PPC: dbdma: macio: Fix format specifiers (build regression)
watchdog: Remove break after exit
exec: Remove env from list of poisoned names
hw/9pfs: Fix potential memory leak and avoid reuse of freed memory
timer: make timers_state static
aes: Remove unused code (NDEBUG, u16)
Diffstat (limited to 'include')
| -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 |