Merge commit 'e82bcec25f19846bfb899d55c9fb5915516b378a' into upstream-merge

* commit 'e82bcec25f19846bfb899d55c9fb5915516b378a':
  port qemu-kvm's on_vcpu code
  standardize on qemu_cpu_kick for signalling cpu thread(s)
  make SIG_IPI to tcg vcpu thread reliable
  kvm: set cpu_single_env around KVM_RUN ioctl
  Fix -mem-path with hugetlbfs
  doc: Clean up monitor command function index
  doc: Heading for monitor command cpu got lost, restore it
  doc: Fix acl monitor command documentation
  doc: Fix host forwarding monitor command documentation
  lsi: Handle removal of selected devices
  lsi: Adjust some register reset values
  lsi: Purge message queue on reset
  scsi-disk: Clear aiocb on read completion
  SCSI: Add disk reset handler
  iov: Move from hw/ to topdir
  vnc: set the right prefered encoding
  sparc: Fix lazy flag calculation on interrupts, refactor
  sparc: lazy C flag calculation

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/monitor.c b/monitor.c
index f7d7cc6ab..f6f86f032 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2887,7 +2887,8 @@ static target_long monitor_get_tbl (const struct MonitorDef *md, int val)
 static target_long monitor_get_psr (const struct MonitorDef *md, int val)
 {
     CPUState *env = mon_get_cpu();
-    return GET_PSR(env);
+
+    return cpu_get_psr(env);
 }
 #endif