[PATCH 1/2] Update errno and ioctl definitions for newer Linux

[Dmitry V. Levin]

On Tue, Oct 23, 2012 at 05:36:58PM +0100, Steve McIntyre wrote:
> Update errno and ioctl definitions for newer Linux
> 
> Signed-off-by: Steve McIntyre <steve.mcintyre at linaro.org>
> ---
>  linux/errnoent.h    |    4 +-
>  linux/ioctlent.h.in |  121 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 123 insertions(+), 2 deletions(-)
> 
> diff --git a/linux/errnoent.h b/linux/errnoent.h
> index e43bff5..c2ac683 100644
> --- a/linux/errnoent.h
> +++ b/linux/errnoent.h
> @@ -519,8 +519,8 @@
>  	"ERESTARTNOHAND", /* 514 */
>  	"ENOIOCTLCMD", /* 515 */
>  	"ERESTART_RESTARTBLOCK", /* 516 */
> -	"ERRNO_517", /* 517 */
> -	"ERRNO_518", /* 518 */
> +	"EPROBE_DEFER", /* 517 */
> +	"EOPENSTALE", /* 518 */
>  	"ERRNO_519", /* 519 */
>  	"ERRNO_520", /* 520 */
>  	"EBADHANDLE", /* 521 */

This one is obvious.  Please add a ChangeLog-style entry (see
README-hacking file for details) for this errnoent.h patch.

> diff --git a/linux/ioctlent.h.in b/linux/ioctlent.h.in
> index 98ebbcc..1ca126a 100644
> --- a/linux/ioctlent.h.in
> +++ b/linux/ioctlent.h.in
> @@ -2,6 +2,7 @@
>  	{"linux/fs.h",	"FIBMAP",	0x0001},
>  	{"linux/fs.h",	"FIGETBSZ",	0x0002},
>  	{"linux/fd.h",	"FDGETPRM",	0x0204},
> +	{"linux/fd.h",	"FDGETPRM32",	0x0204},

I'm not sure such entries are worth adding.  I know we have these
redundant "*32" entries in linux/ioctlent.h.in already, maybe it's time
to strip them instead of adding new ones.

> @@ -737,21 +757,91 @@
>  	{"sound/asound.h",	"SNDRV_TIMER_IOCTL_PVERSION",	0x5400},
>  	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
>  	{"sound/asound.h",	"SNDRV_TIMER_IOCTL_NEXT_DEVICE",	0x5401},
> +	{"asm-generic/ioctls.h",	"TCGETS",	0x5401},

We were adding asm-generic entries to arch-specific ioctlent files before.
I'm not sure whether we'd rather move all these entries to the common
ioctlent file as indirectly proposed by this patch.
Any ideas why we might want to continue the old practice?


-- 
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20121024/9f9fb963/attachment.bin>