From patchwork Thu Apr 23 07:20:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47447 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9948D20553 for ; Thu, 23 Apr 2015 07:28:54 +0000 (UTC) Received: by laat2 with SMTP id t2sf2060444laa.2 for ; Thu, 23 Apr 2015 00:28:53 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=M6srFezQ1hOj8fO5lesDtYSwNLOcGwmXD9LQ2Ny0fJY=; b=G6f4+KIL5icFKzDXbCtzQELU+jfYMa+VLjhYU2KgTQFwsoej+zV2r2hFFeeoSofHyV ZQWGTo+ItAE48rzxUDyEcO7yT6YV7NK6QWAQ1IIO3EscahBnMftODni2AG2JemB54pge RhqPFNlVJKn+RVeBtre8AHp/PLuAzXeuHGs/p0H6vja2WWppzc+nw/tmkT1ggdr6V8vR PnjqrgFPd2uGtdAIDqufAqbGBREtTOeeJ3w0f7vYKFL4yeIEcRnt1aqkWBOBunNUezn6 yWpyi2pzJHa1qpFxk3Mtyc2p1NVNwhmOL/ETDTHtvDjLxKb6G+JCaGVBqLegwjkH6DZm +rJQ== X-Gm-Message-State: ALoCoQmTjMKbG8ZN5/cAP0WgJyqxBVlumF5RYfr+tA/pSQbMdKrZ8mw7spNVcPu/Iqy4POvKZUbD X-Received: by 10.180.10.136 with SMTP id i8mr946966wib.7.1429774133574; Thu, 23 Apr 2015 00:28:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.41 with SMTP id t9ls304831lal.82.gmail; Thu, 23 Apr 2015 00:28:53 -0700 (PDT) X-Received: by 10.112.139.1 with SMTP id qu1mr1299060lbb.8.1429774133330; Thu, 23 Apr 2015 00:28:53 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id zn4si5395313lbb.103.2015.04.23.00.28.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 00:28:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by laat2 with SMTP id t2so6537833laa.1 for ; Thu, 23 Apr 2015 00:28:53 -0700 (PDT) X-Received: by 10.112.204.6 with SMTP id ku6mr1242420lbc.73.1429774133226; Thu, 23 Apr 2015 00:28:53 -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 l1csp400960lbt; Thu, 23 Apr 2015 00:28:52 -0700 (PDT) X-Received: by 10.66.63.72 with SMTP id e8mr2689873pas.3.1429773729652; Thu, 23 Apr 2015 00:22:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nl4si11190826pbc.114.2015.04.23.00.22.08; Thu, 23 Apr 2015 00:22:09 -0700 (PDT) Received-SPF: none (google.com: stable-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 S1756381AbbDWHV4 (ORCPT + 2 others); Thu, 23 Apr 2015 03:21:56 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:39012 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756177AbbDWHVc (ORCPT ); Thu, 23 Apr 2015 03:21:32 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YlBRy-00071L-4Z; Thu, 23 Apr 2015 09:21:30 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Alex Elder , Alex Elder , Sage Weil , David Miller , Andrew Morton , Linus Torvalds , Jiri Slaby Subject: [patch added to the 3.12 stable tree] conditionally define U32_MAX Date: Thu, 23 Apr 2015 09:20:48 +0200 Message-Id: <1429773689-26866-10-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1429773689-26866-1-git-send-email-jslaby@suse.cz> References: <1429773689-26866-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.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.41 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 This patch has been added to the 3.12 stable tree. If you have any objections, please let us 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