From ea5e1b6a5e93be2ee862ab87ecdb1ba277cbface Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 13 Aug 2011 15:14:58 +0000 Subject: [PATCH] Fix VKI_FIOQSIZE definition on ppc platforms. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11973 --- include/vki/vki-ppc32-linux.h | 8 +------- include/vki/vki-ppc64-linux.h | 7 +------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h index 7ab8ff7713..abf8515911 100644 --- a/include/vki/vki-ppc32-linux.h +++ b/include/vki/vki-ppc32-linux.h @@ -543,7 +543,7 @@ struct vki_termios { #define VKI_FIONBIO _VKI_IOW('f', 126, int) #define VKI_FIONREAD _VKI_IOR('f', 127, int) //#define VKI_TIOCINQ VKI_FIONREAD -//#define VKI_FIOQSIZE _VKI_IOR('f', 128, vki_loff_t) +#define VKI_FIOQSIZE _VKI_IOR('f', 128, vki_loff_t) //#define VKI_TIOCGETP _VKI_IOR('t', 8, struct vki_sgttyb) //#define VKI_TIOCSETP _VKI_IOW('t', 9, struct vki_sgttyb) @@ -637,12 +637,6 @@ struct vki_termios { //#define VKI_TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ #define VKI_TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -//---------------------------------------------------------------------- -// From linux-2.6.39-rc2/arch/powerpc/include/asm/ioctls.h -//---------------------------------------------------------------------- - -#define VKI_FIOQSIZE VKI_IOR('f', 128, vki_loff_t) - //---------------------------------------------------------------------- // From linux-2.6.9/include/asm-ppc/poll.h //---------------------------------------------------------------------- diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h index f813c34f8f..fdccc5676b 100644 --- a/include/vki/vki-ppc64-linux.h +++ b/include/vki/vki-ppc64-linux.h @@ -620,12 +620,7 @@ struct vki_termios { #define VKI_FIOASYNC _VKI_IOW('f', 125, int) #define VKI_TIOCSERGETLSR 0x5459 /* Get line status register */ #define VKI_TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ - -//---------------------------------------------------------------------- -// From linux-2.6.39-rc2/arch/powerpc/include/asm/ioctls.h -//---------------------------------------------------------------------- - -#define VKI_FIOQSIZE VKI_IOR('f', 128, vki_loff_t) +#define VKI_FIOQSIZE _VKI_IOR('f', 128, vki_loff_t) //---------------------------------------------------------------------- // From linux-2.6.13/include/asm-ppc64/poll.h -- 2.47.3