diff options
| author | Anthony Liguori | 2013-06-14 14:50:36 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-06-14 14:50:36 +0200 |
| commit | 6e8d2b654656830877937ba02bb8ea1c4945a1fc (patch) | |
| tree | 1e5cbe1ecf5352eb607321b580ff997ef6035721 /include | |
| parent | qemu-char: don't issue CHR_EVENT_OPEN in a BH (diff) | |
| parent | tcg: Remove redundant tcg_target_init checks (diff) | |
| download | qemu-6e8d2b654656830877937ba02bb8ea1c4945a1fc.tar.gz qemu-6e8d2b654656830877937ba02bb8ea1c4945a1fc.tar.xz qemu-6e8d2b654656830877937ba02bb8ea1c4945a1fc.zip | |
Merge remote-tracking branch 'rth/tcg-for-anthony' into staging
# By Richard Henderson
# Via Richard Henderson
* rth/tcg-for-anthony:
tcg: Remove redundant tcg_target_init checks
tcg: Use QEMU_BUILD_BUG_ON for CPU_TLB_ENTRY_BITS
Message-id: 1370437167-11278-1-git-send-email-rth@twiddle.net
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/cpu-defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index d8c64e9278..2e5a9bab3c 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -99,7 +99,7 @@ typedef struct CPUTLBEntry { sizeof(uintptr_t))]; } CPUTLBEntry; -extern int CPUTLBEntry_wrong_size[sizeof(CPUTLBEntry) == (1 << CPU_TLB_ENTRY_BITS) ? 1 : -1]; +QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS)); #define CPU_COMMON_TLB \ /* The meaning of the MMU modes is defined in the target code. */ \ |