aboutsummaryrefslogtreecommitdiffstats
path: root/target-arm
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-02-09 15:34:16 -0800
committerAndroid Code Review <code-review@android.com>2011-02-09 15:34:16 -0800
commit1ebd6d701f91c34f4562f522d5b2ce32be056d85 (patch)
treec79222448d637e3cf8d9fc5279d0293275812521 /target-arm
parentd98942188f1b190b2e2a2a7a4cb11bc4f8a22739 (diff)
parenta39b10bd2574825a815d6ad854499dd127cfa9cb (diff)
downloadexternal_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.zip
external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.tar.gz
external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.tar.bz2
Merge "Build arm and x86 binaries at the same time."
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 258e2cb..f595b2c 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1214,7 +1214,7 @@ static inline int get_phys_addr(CPUState *env, uint32_t address,
int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address,
int access_type, int mmu_idx, int is_softmmu)
{
- uint32_t phys_addr;
+ uint32_t phys_addr = 0;
int prot;
int ret, is_user;
@@ -1244,7 +1244,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address,
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{
- uint32_t phys_addr;
+ uint32_t phys_addr = 0;
int prot;
int ret;