From patchwork Wed Sep 9 21:08:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 7149131 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4CB269F1D3 for ; Wed, 9 Sep 2015 21:16:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7043420991 for ; Wed, 9 Sep 2015 21:16:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 921BF20989 for ; Wed, 9 Sep 2015 21:16:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755736AbbIIVP5 (ORCPT ); Wed, 9 Sep 2015 17:15:57 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34897 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753392AbbIIVIs (ORCPT ); Wed, 9 Sep 2015 17:08:48 -0400 Received: by pacfv12 with SMTP id fv12so21098889pac.2 for ; Wed, 09 Sep 2015 14:08:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:subject:date:message-id:in-reply-to:references; bh=4dFhPd9GbjwcOlWzrBFvmkYm89NiVrouBILBhMy5q28=; b=Hfo8yE2wnxOMu5aYeUSC1SlFDp5vDr2kv6G6egG0b3+e4nhenbmrRfm8cvaZyfIDsz +gHr76hV4G1taKkCeNEnSafX8vrCELnKjac+VGuYcV9XpjTGQyQdG6cG6Kp8i1W5MGbo Np+PKohluC6nwTRKz+n9Z1VUKp5BRLCi4fOHhFBtXKvRUWwZ3fEkuYDxCNazfinoYoXc 751j1NjKlZXnslAAFmsAQEQ3/vnpRSa7uJ2HokL/iwyev9dR2CTQkiiVUXvSI/YbIt+B Vy1iBTVzq5roJPnxLUvDSf/AbgfWEKf1XV9rybNX24GoCVDzrT4tPvVSoQr1vez7Ghnt UOlA== X-Gm-Message-State: ALoCoQkR72g1CBOCqIn66MDyoMDKQRukxDPOZgcT6KBL+PPCwebQVzylm2B07nsSOD2bKu9FWAh6 X-Received: by 10.67.8.106 with SMTP id dj10mr65459432pad.123.1441832928461; Wed, 09 Sep 2015 14:08:48 -0700 (PDT) Received: from localhost (wap-cal.CS.Berkeley.EDU. [128.32.35.228]) by smtp.gmail.com with ESMTPSA id xf6sm8003426pbc.70.2015.09.09.14.08.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Sep 2015 14:08:48 -0700 (PDT) From: Palmer Dabbelt To: arnd@arndb.de Cc: 3chas3@gmail.com Cc: hpa@zytor.com Cc: mingo@redhat.com Cc: plagnioj@jcrosoft.com Cc: jikos@kernel.org Cc: linux-api@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-atm-general@lists.sourceforge.net Cc: linux-fbdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org Cc: tglx@linutronix.de Cc: tomi.valkeinen@ti.com Cc: x86@kernel.org Cc: Palmer Dabbelt Subject: [PATCH 03/13] Hide COMPAT_ATM_ADDPARTY behind #ifdef __KERNEL__ Date: Wed, 9 Sep 2015 14:08:12 -0700 Message-Id: <1441832902-28993-4-git-send-email-palmer@dabbelt.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1441832902-28993-1-git-send-email-palmer@dabbelt.com> References: <2644177.lVCYzIBfPW@wuerfel> <1441832902-28993-1-git-send-email-palmer@dabbelt.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This used to just be behind an #ifdef COMPAT_COMPAT, so most of userspace wouldn't have seen the definition before. This change just makes the __KERNEL__ part explicit to quiet the header checker. Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou --- include/uapi/linux/atmdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h index 93e0ec008ca8..f8b6223165da 100644 --- a/include/uapi/linux/atmdev.h +++ b/include/uapi/linux/atmdev.h @@ -100,7 +100,7 @@ struct atm_dev_stats { /* use backend to make new if */ #define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) /* add party to p2mp call */ -#ifdef CONFIG_COMPAT +#if defined(__KERNEL__) && defined(CONFIG_COMPAT) /* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ #define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf) #endif