Merge commit '5f6b9e8fd5b9516170e582d9b6c27c98519a8031' into upstream-merge

* commit '5f6b9e8fd5b9516170e582d9b6c27c98519a8031': (29 commits)
  Probe for fdatasync()
  PPC: make system bus parent of PCI bus
  Fix indentation
  ESP: convert to VMState
  target-alpha: fix extlh instruction
  target-ppc: optimize slw/srw/sld/srd
  audio: use correct email address
  audio: internal API change
  sdlaudio: use correct function names in sdl_XXX calls
  oss: use audio_pcm_hw_clip_out
  alsa: use audio_pcm_hw_clip_out
  audio: introduce audio_pcm_hw_clip_out helper function
  audio: use muldiv64 where it makes sense
  coreaudio: fix sloppy "posixification" by 1ea879e5580f63414693655fcf0328559cdce138
  tcg: fix size of local variables in tcg_gen_bswap64_i64
  qemu serial: lost tx irqs (affecting FreeBSD's new uart(4) driver)
  fix typo in configure --help
  escc: fix IRQ routing, broken by 6c319c82223a1766c5d64a20051e5c6ab7b53951
  ide/isa: convert to qdev.
  ide/pci: convert to qdev.
  ...

Conflicts:
	configure

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

1 files changed, 1 insertions, 1 deletions

diff --git a/cutils.c b/cutils.c
index 7163d3a36..be99b2167 100644
--- a/cutils.c
+++ b/cutils.c
@@ -124,7 +124,7 @@ int qemu_fls(int i)
  */
 int qemu_fdatasync(int fd)
 {
-#ifdef _POSIX_SYNCHRONIZED_IO
+#ifdef CONFIG_FDATASYNC
     return fdatasync(fd);
 #else
     return fsync(fd);