diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-09-17 19:04:14 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-09-17 19:04:14 +0000 |
| commit | 7ee930d03130e69282503949202b9e6812e8c1bd (patch) | |
| tree | 22c61fde79af6b1227e20a2707f8a501f46348c6 /hw | |
| parent | 5628a6260ae8854d669d41aabb8c29a7a5b4bff9 (diff) | |
Fix warnings that would be caused by ld flag --warn-common
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5240 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm-misc.h | 2 | ||||
| -rw-r--r-- | hw/armv7m_nvic.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/arm-misc.h b/hw/arm-misc.h index f118edb3bd..a147254287 100644 --- a/hw/arm-misc.h +++ b/hw/arm-misc.h @@ -37,7 +37,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info); /* Multiplication factor to convert from system clock ticks to qemu timer ticks. */ -int system_clock_scale; +extern int system_clock_scale; qemu_irq *armv7m_nvic_init(CPUState *env); /* stellaris_enent.c */ diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c index c55c958718..86d0cf8f9e 100644 --- a/hw/armv7m_nvic.c +++ b/hw/armv7m_nvic.c @@ -50,6 +50,8 @@ typedef struct { #define SYSTICK_CLKSOURCE (1 << 2) #define SYSTICK_COUNTFLAG (1 << 16) +int system_clock_scale; + /* Conversion factor from qemu timer to SysTick frequencies. */ static inline int64_t systick_scale(nvic_state *s) { |