Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4600666pxj; Wed, 12 May 2021 09:01:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypCoGfjlmYXyVJsyv2e4iQCmT4qkfzIhpJCH6npOm/r1Pkn2GE8iS0nYW6SYgE70zDtV8G X-Received: by 2002:a05:6512:3d94:: with SMTP id k20mr24748432lfv.604.1620835294410; Wed, 12 May 2021 09:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620835294; cv=none; d=google.com; s=arc-20160816; b=ccTgrzMr8JwK3UasNzPBs1qKo92s240eU9hn4/ibbjt5u2J3DG6KsOD3aGLsF1nu5Y 2DD4lFgSOq6BAQyknmleeI8Oo1die5H+k9oRsC0RwI7W+00vE7ocDcJCSi7Tj3k5auvc 7jDaLD9Kl1Ev4zEGid16Y3u+m373N5slcbF+m+K8DGud2n9wdXXr2/ju3y6Xw144XJ4P cvWyhbQ6n4HJW+E5Dq5qLVR057Lk6R8NSr0l8XRzWAB//LBa1kKf5RaDfzkLZOxuZnqO O3ja27SYG5pXXOdeBBPxKyy6h9NSdNhlGUZVE95rMj/i5Jag7hRotR9dCO49Si6Nye5v YibQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4Ov55OY8e5hoyv9Pgnq/EhPljVMSvmEFX5YGvBkOwh8=; b=ITV00x71iKRWasTEp4BUglNWi6mYLN9Xmqc9kII1UTHunq6KGjM1FG6q44pd417uTo ojAQPH+rwfbWmsgzJqJLP1+nEdSCgozRAyfmgjnnnlwSD/zymZzNYXoSCYiCFeQKBY3O TrKUmY2lBDmxIdHjnq1kDvDcx79lE2eB73tzziGgnmzcnZB89x/3xLqmVkICvihADlrl tqIGK8duZxSqQTuKlm68F1mOQhSCoWOSGCDjvp4sGu+63f0ynznrnRFhLN6mZxSYjvYl a7jt9g4dD4GtNGU5BiWKWlfI24Vpi/dRg7UXMusqICPwODIiSCNJtvZM4b2M8SFRjQgg pi9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iErJRR2m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id um1si134616ejb.327.2021.05.12.09.01.09; Wed, 12 May 2021 09:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iErJRR2m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238113AbhELP5W (ORCPT + 99 others); Wed, 12 May 2021 11:57:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:40990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235348AbhELP1i (ORCPT ); Wed, 12 May 2021 11:27:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE5F86145B; Wed, 12 May 2021 15:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620832354; bh=sCBOWjPFlsAS3ZI4sQKtAA1bAk5Y6r/rQizYVdgRpKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iErJRR2m9hzP0Ok7rhEA2E58Gd3k1mUZ4738VbKJjuJZCInn7W4UItwtScNzeVZBV ElbDoqVWfIYra8cliyVAgvyD7cmM/n2U0DU/FWd1k3896tM4UFEcFs0K6koVfCQlOD dfn2dmV0Ob1uStGTc6Lqa7fBTiey30DuZRApr7s4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Sasha Levin Subject: [PATCH 5.10 245/530] tty: actually undefine superseded ASYNC flags Date: Wed, 12 May 2021 16:45:55 +0200 Message-Id: <20210512144827.885941093@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144819.664462530@linuxfoundation.org> References: <20210512144819.664462530@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Hovold [ 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 Link: https://lore.kernel.org/r/20210407095208.31838-2-johan@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- include/uapi/linux/tty_flags.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- 2.30.2