diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-13 17:55:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-13 17:55:35 +0100 |
| commit | 507e4ddc3abf67391bcbc9624fd60b969c159b78 (patch) | |
| tree | cc3d002111bc6619c0f0a1516dbc721508cdfdf4 /cpus.c | |
| parent | 2d31515bc0880a1cea86ce638d2a109f4f4e6f7d (diff) | |
| parent | eb83c2030aa037b4c6037bfa3cbe181343dc6a8b (diff) | |
| download | qemu-507e4ddc3abf67391bcbc9624fd60b969c159b78.tar.gz | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2016-09-13
# gpg: Signature made Tue 13 Sep 2016 16:53:11 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch:
hw/net/e1000e: Fix compiler warning
target-m68k: fix get_mac_extf helper
timer/cpus: fix some typos and update some comments
timer.h: fix inconsistency between comment and function prototype
timer.h: fix typo
maint: Ignore generated version file
Document that curses usually needs -k option too
trace-event: display "%d" instead of "0x%d"
linux-user, trivial: display "0x%x" instead of "0x%d"
pic: fix typo in error message: KVM_GET_IRQCHIP -> KVM_SET_IRQCHIP
sparc: Use g_memdup() instead of g_new0() + memcpy()
vl: remove unnecessary duplicate call to tpm_cleanup
arm: spelling fix: mismatch
hw/dma/omap: spelling fix: endianness
hw/bt/hci: spelling fix: endianness
docs: Fix description of the leaky bucket algorithm in throttle.txt
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'cpus.c')
| -rw-r--r-- | cpus.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -229,7 +229,7 @@ static int64_t cpu_get_clock_locked(void) return ticks; } -/* return the host CPU monotonic timer and handle stop/restart */ +/* return the host CPU monotonic time */ int64_t cpu_get_clock(void) { int64_t ti; @@ -244,7 +244,7 @@ int64_t cpu_get_clock(void) } /* enable cpu_get_ticks() - * Caller must hold BQL which server as mutex for vm_clock_seqlock. + * Caller must hold BQL which serves as mutex for vm_clock_seqlock. */ void cpu_enable_ticks(void) { @@ -260,7 +260,7 @@ void cpu_enable_ticks(void) /* disable cpu_get_ticks() : the clock is stopped. You must not call * cpu_get_ticks() after that. - * Caller must hold BQL which server as mutex for vm_clock_seqlock. + * Caller must hold BQL which serves as mutex for vm_clock_seqlock. */ void cpu_disable_ticks(void) { |