]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Input: avoid BIT() macro usage in the serio.h UAPI header
authorEugene Syromiatnikov <esyr@redhat.com>
Tue, 24 Mar 2020 22:53:50 +0000 (15:53 -0700)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Tue, 7 Apr 2020 08:52:46 +0000 (10:52 +0200)
BugLink: https://bugs.launchpad.net/bugs/1870604
commit 52afa505a03d914081f40cb869a3248567a57573 upstream.

The commit 19ba1eb15a2a ("Input: psmouse - add a custom serio protocol
to send extra information") introduced usage of the BIT() macro
for SERIO_* flags; this macro is not provided in UAPI headers.
Replace if with similarly defined _BITUL() macro defined
in <linux/const.h>.

Fixes: 19ba1eb15a2a ("Input: psmouse - add a custom serio protocol to send extra information")
Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
Cc: <stable@vger.kernel.org> # v5.0+
Link: https://lore.kernel.org/r/20200324041341.GA32335@asgard.redhat.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
include/uapi/linux/serio.h

index a0cac1d8670d8a89320adba86688aee6ef8a63b7..1937915be4137a3b122461495cd179f0c3105885 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef _UAPI_SERIO_H
 #define _UAPI_SERIO_H
 
-
+#include <linux/const.h>
 #include <linux/ioctl.h>
 
 #define SPIOCSTYPE     _IOW('q', 0x01, unsigned long)
 /*
  * bit masks for use in "interrupt" flags (3rd argument)
  */
-#define SERIO_TIMEOUT  BIT(0)
-#define SERIO_PARITY   BIT(1)
-#define SERIO_FRAME    BIT(2)
-#define SERIO_OOB_DATA BIT(3)
+#define SERIO_TIMEOUT  _BITUL(0)
+#define SERIO_PARITY   _BITUL(1)
+#define SERIO_FRAME    _BITUL(2)
+#define SERIO_OOB_DATA _BITUL(3)
 
 /*
  * Serio types