On Mon, 2017-11-27 at 11:30 -0800, Deepa Dinamani wrote:
[...]
> @@ -15,9 +16,7 @@ struct pollfd;
> enum timespec_type {
> TT_NONE = 0,
> TT_NATIVE = 1,
> -#ifdef CONFIG_COMPAT
> TT_COMPAT = 2,
> -#endif
> };
>
> /*
> @@ -40,10 +39,8 @@ struct restart_block {
> clockid_t clockid;
> enum timespec_type type;
> union {
> - struct timespec __user *rmtp;
> -#ifdef CONFIG_COMPAT
> + struct __kernel_timespec __user *rmtp;
> struct compat_timespec __user *compat_rmtp;
> -#endif
> };
> u64 expires;
> } nanosleep;
[...]
The deletions of #ifdef and #endif here seem to belong in patch #6, as
that's the one that changes the condition for the compat nanosleep
implementation which uses the compat_rmtp field.
Ben.
--
Ben Hutchings
Software Developer, Codethink Ltd.
