From 609b58ca49375d0f6793cb5f8e34259aad5ed227 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 25 Feb 2011 23:29:01 +0000 Subject: [PATCH] ioctlsort: sync with ioctl_lookup() * linux/ioctlsort.c (main): Use NR and TYPE bits only, to sync with ioctl_lookup() which looks at these bits only. --- linux/ioctlsort.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/ioctlsort.c b/linux/ioctlsort.c index afdcc5f6..6ee6c073 100644 --- a/linux/ioctlsort.c +++ b/linux/ioctlsort.c @@ -35,10 +35,10 @@ int compare(const void* a, const void* b) { int main(int argc, char** argv) { int i; -#if defined(POWERPC) || defined(__powerpc__) /* unspeakable kludge */ + /* ioctl_lookup() only looks at the NR and TYPE bits atm. */ for (i = 0; i < nioctls; i++) - ioctls[i].code &= ~_IOC_DIRMASK; -#endif + ioctls[i].code &= (_IOC_NRMASK << _IOC_NRSHIFT) | + (_IOC_TYPEMASK << _IOC_TYPESHIFT); qsort(ioctls, nioctls, sizeof(ioctls[0]), compare); puts ("\t/* Generated by ioctlsort */"); -- 2.50.1