On Wed, May 12, 2021 at 05:17:32PM +0200, Johan Hovold wrote: > On Wed, May 12, 2021 at 04:45:55PM +0200, Greg Kroah-Hartman wrote: > > From: Johan Hovold <johan@kernel.org> > > > > [ Upstream commit d09845e98a05850a8094ea8fd6dd09a8e6824fff ] > > > > Some kernel-internal ASYNC flags have been superseded by tty-port flags > > and should no longer be used by kernel drivers. > > > > Fix the misspelled "__KERNEL__" compile guards which failed their sole > > purpose to break out-of-tree drivers that have not yet been updated. > > > > Fixes: 5c0517fefc92 ("tty: core: Undefine ASYNC_* flags superceded by TTY_PORT* flags") > > Signed-off-by: Johan Hovold <johan@kernel.org> > > Link: https://lore.kernel.org/r/20210407095208.31838-2-johan@kernel.org > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Signed-off-by: Sasha Levin <sashal@kernel.org> > > I don't think this should be backported to any stable tree and the > stable tag was left out on purpose. It's about time that userspace gets this right, so this should be fine as it's something that any out-of-tree code is going to have to get correct eventually. thanks, greg k-h
On Fri, May 14, 2021 at 09:55:01AM +0200, Greg Kroah-Hartman wrote: > On Wed, May 12, 2021 at 05:17:32PM +0200, Johan Hovold wrote: > > On Wed, May 12, 2021 at 04:45:55PM +0200, Greg Kroah-Hartman wrote: > > > From: Johan Hovold <johan@kernel.org> > > > > > > [ Upstream commit d09845e98a05850a8094ea8fd6dd09a8e6824fff ] > > > > > > Some kernel-internal ASYNC flags have been superseded by tty-port flags > > > and should no longer be used by kernel drivers. > > > > > > Fix the misspelled "__KERNEL__" compile guards which failed their sole > > > purpose to break out-of-tree drivers that have not yet been updated. > > > > > > Fixes: 5c0517fefc92 ("tty: core: Undefine ASYNC_* flags superceded by TTY_PORT* flags") > > > Signed-off-by: Johan Hovold <johan@kernel.org> > > > Link: https://lore.kernel.org/r/20210407095208.31838-2-johan@kernel.org > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > Signed-off-by: Sasha Levin <sashal@kernel.org> > > > > I don't think this should be backported to any stable tree and the > > stable tag was left out on purpose. > > It's about time that userspace gets this right, so this should be fine > as it's something that any out-of-tree code is going to have to get > correct eventually. Eventually, yes. Just doesn't seem right to break stuff on purpose in a minor stable update. That said, I really don't care one bit about out-of-tree drivers so go ahead if you want to. Johan
diff --git a/include/uapi/linux/tty_flags.h b/include/uapi/linux/tty_flags.h index 900a32e63424..6a3ac496a56c 100644 --- a/include/uapi/linux/tty_flags.h +++ b/include/uapi/linux/tty_flags.h @@ -39,7 +39,7 @@ * WARNING: These flags are no longer used and have been superceded by the * TTY_PORT_ flags in the iflags field (and not userspace-visible) */ -#ifndef _KERNEL_ +#ifndef __KERNEL__ #define ASYNCB_INITIALIZED 31 /* Serial port was initialized */ #define ASYNCB_SUSPENDED 30 /* Serial port is suspended */ #define ASYNCB_NORMAL_ACTIVE 29 /* Normal device is active */ @@ -81,7 +81,7 @@ #define ASYNC_SPD_WARP (ASYNC_SPD_HI|ASYNC_SPD_SHI) #define ASYNC_SPD_MASK (ASYNC_SPD_HI|ASYNC_SPD_VHI|ASYNC_SPD_SHI) -#ifndef _KERNEL_ +#ifndef __KERNEL__ /* These flags are no longer used (and were always masked from userspace) */ #define ASYNC_INITIALIZED (1U << ASYNCB_INITIALIZED) #define ASYNC_NORMAL_ACTIVE (1U << ASYNCB_NORMAL_ACTIVE)