From patchwork Mon Apr 27 21:31:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47649 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E1E320553 for ; Mon, 27 Apr 2015 21:54:34 +0000 (UTC) Received: by wgtl5 with SMTP id l5sf29117049wgt.1 for ; Mon, 27 Apr 2015 14:54:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=8enifzRFKrqxXbc2JgLn4FLkMwZIc72K1gt6DQWasxs=; b=aQrRi3MXQR27V/GUJ2KfFk8QpbCB0UitOIwce6SFXpApM8xu8aRmyjGbM5OW8I1tYr hWYf1vr8jFucJKr0jNz83xMpJRRGkgHVFPXTsbxgw0MpMhgRyqB9lx3x4hXOgR2pl8br /R825z41QYC1Z7I3TzOcuCe0GlyLdgjDb0glzdgg68iiHxzlaNf//8HlAZyhPQd5BnjC Fy+fpIbfvjoLxR3OPZM4KepsgXXwpi2oo6UC0yEIQGFg42f8iBhvGO/EjKOxBhvU9NID Elj+n52ZHQOYR0cMiyFHmKsqs0USiZG16m5pjYjh0YqPaYqshx0hS3u4ocd96PVaX7Ll gXIQ== X-Gm-Message-State: ALoCoQlo2Nr6257g9S1po9uldGNOPWh//8qsbRxi97TqgpfsXVI3RBya02D354LKDzOIhawi0lTo X-Received: by 10.194.5.229 with SMTP id v5mr2382144wjv.0.1430171673764; Mon, 27 Apr 2015 14:54:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.245.43 with SMTP id xl11ls976lac.21.gmail; Mon, 27 Apr 2015 14:54:33 -0700 (PDT) X-Received: by 10.152.27.194 with SMTP id v2mr11640623lag.75.1430171673474; Mon, 27 Apr 2015 14:54:33 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id an10si15626010lac.169.2015.04.27.14.54.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Apr 2015 14:54:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by lagv1 with SMTP id v1so90536743lag.3 for ; Mon, 27 Apr 2015 14:54:33 -0700 (PDT) X-Received: by 10.153.8.167 with SMTP id dl7mr11887226lad.86.1430171673344; Mon, 27 Apr 2015 14:54:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp1527017lbt; Mon, 27 Apr 2015 14:54:32 -0700 (PDT) X-Received: by 10.70.128.200 with SMTP id nq8mr26142961pdb.167.1430171671486; Mon, 27 Apr 2015 14:54:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w10si31648448pas.114.2015.04.27.14.54.30; Mon, 27 Apr 2015 14:54:31 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965685AbbD0VyZ (ORCPT + 27 others); Mon, 27 Apr 2015 17:54:25 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:49588 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965285AbbD0Vc5 (ORCPT ); Mon, 27 Apr 2015 17:32:57 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1Ymqe6-0003vb-SC; Mon, 27 Apr 2015 23:32:54 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alex Elder , Alex Elder , Sage Weil , David Miller , Andrew Morton , Linus Torvalds , Jiri Slaby Subject: [PATCH 3.12 10/83] conditionally define U32_MAX Date: Mon, 27 Apr 2015 23:31:41 +0200 Message-Id: X-Mailer: git-send-email 2.3.5 In-Reply-To: <3426bb8de3a655aa6668e92ee92eb35f0db86582.1430159990.git.jslaby@suse.cz> References: <3426bb8de3a655aa6668e92ee92eb35f0db86582.1430159990.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Alex Elder 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 77719536dc00f8fd8f5abe6dadbde5331c37f996 upstream. The symbol U32_MAX is defined in several spots. Change these definitions to be conditional. This is in preparation for the next patch, which centralizes the definition in . Signed-off-by: Alex Elder Cc: Sage Weil Cc: David Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Jiri Slaby --- fs/reiserfs/reiserfs.h | 2 ++ include/linux/ceph/decode.h | 2 ++ net/ipv4/tcp_illinois.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h index f8adaee537c2..66a2e832fa8d 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -1958,7 +1958,9 @@ struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,} #define MAX_US_INT 0xffff // reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset +#ifndef U32_MAX #define U32_MAX (~(__u32)0) +#endif /* !U32_MAX */ static inline loff_t max_reiserfs_offset(struct inode *inode) { diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h index 0442c3d800f0..27fe66a279b1 100644 --- a/include/linux/ceph/decode.h +++ b/include/linux/ceph/decode.h @@ -10,6 +10,7 @@ /* This seemed to be the easiest place to define these */ +#ifndef U32_MAX #define U8_MAX ((u8)(~0U)) #define U16_MAX ((u16)(~0U)) #define U32_MAX ((u32)(~0U)) @@ -24,6 +25,7 @@ #define S16_MIN ((s16)(-S16_MAX - 1)) #define S32_MIN ((s32)(-S32_MAX - 1)) #define S64_MIN ((s64)(-S64_MAX - 1LL)) +#endif /* !U32_MAX */ /* * in all cases, diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c index 834857f3c871..ffb2615d286f 100644 --- a/net/ipv4/tcp_illinois.c +++ b/net/ipv4/tcp_illinois.c @@ -23,7 +23,9 @@ #define ALPHA_MIN ((3*ALPHA_SCALE)/10) /* ~0.3 */ #define ALPHA_MAX (10*ALPHA_SCALE) /* 10.0 */ #define ALPHA_BASE ALPHA_SCALE /* 1.0 */ +#ifndef U32_MAX #define U32_MAX ((u32)~0U) +#endif /* !U32_MAX */ #define RTT_MAX (U32_MAX / ALPHA_MAX) /* 3.3 secs */ #define BETA_SHIFT 6