From patchwork Thu Apr 23 07:20:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47445 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5A25220553 for ; Thu, 23 Apr 2015 07:22:09 +0000 (UTC) Received: by lbos2 with SMTP id s2sf1960636lbo.2 for ; Thu, 23 Apr 2015 00:22:08 -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=OT5imt40PGqICHVQdPxLhlF4kvKjAMiKXLVYBfpo7vE=; b=lgbCjWdfSLuXOhX7regO6BrBN4hwnHQ+7XqAPT4mm1ZLLHCS7hskiIZrz5qdxMwC+w tcEz1pOQdCHkdYpzA5WnmUMj8U5Dv+V9GXxpFtfZMM+7MXTAJmWr5iSKHI6+r5A0Vd30 w/yCps//FwA7MgOMR+jH4TxoDISmKoWlTVzYIjmaya1+ygna4XMm9hVQyEYKRt9iGi4a SG4Dq/VbzPOrCweH89cL7ApPbK20C6MpG2d67jyk0gJd4I+XgpnF1cJXgRfe3dBkxcjN m5/Va/WLAgPduawQ3A8/n8Tb9CJxUrj53WKSmnmIk98pVxwQGwTb1M8CLOWPO/do7FLN zXLg== X-Gm-Message-State: ALoCoQnznvVaF9QjTWBEnHS69WNpO2C9OMY6h7SXnOQFHUtB3hc36U5T4sNy0UP7S5r9e04p4XLp X-Received: by 10.112.130.71 with SMTP id oc7mr715164lbb.23.1429773728329; Thu, 23 Apr 2015 00:22:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.134 with SMTP id 6ls279057lam.36.gmail; Thu, 23 Apr 2015 00:22:08 -0700 (PDT) X-Received: by 10.152.45.97 with SMTP id l1mr1272759lam.55.1429773728219; Thu, 23 Apr 2015 00:22:08 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id v13si5383066lal.98.2015.04.23.00.22.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 00:22:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lagv1 with SMTP id v1so6396854lag.3 for ; Thu, 23 Apr 2015 00:22:07 -0700 (PDT) X-Received: by 10.152.36.2 with SMTP id m2mr1250493laj.72.1429773727912; Thu, 23 Apr 2015 00:22:07 -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 l1csp398318lbt; Thu, 23 Apr 2015 00:22:07 -0700 (PDT) X-Received: by 10.68.209.193 with SMTP id mo1mr2720276pbc.142.1429773704690; Thu, 23 Apr 2015 00:21:44 -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.21.43; Thu, 23 Apr 2015 00:21:44 -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 S1755790AbbDWHVj (ORCPT + 2 others); Thu, 23 Apr 2015 03:21:39 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:38935 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755262AbbDWHVc (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-00071T-5G; Thu, 23 Apr 2015 09:21:30 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Alex Elder , Alex Elder , Andrew Morton , Linus Torvalds , Jiri Slaby Subject: [patch added to the 3.12 stable tree] remove extra definitions of U32_MAX Date: Thu, 23 Apr 2015 09:20:50 +0200 Message-Id: <1429773689-26866-12-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.53 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 04f9b74e4d96d349de12fdd4e6626af4a9f75e09 upstream. Now that the definition is centralized in , the definitions of U32_MAX (and related) elsewhere in the kernel can be removed. Signed-off-by: Alex Elder Acked-by: Sage Weil Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Jiri Slaby --- fs/reiserfs/reiserfs.h | 4 ---- include/linux/ceph/decode.h | 19 ------------------- net/ipv4/tcp_illinois.c | 3 --- 3 files changed, 26 deletions(-) diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h index 66a2e832fa8d..dfb617b2bad2 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -1958,10 +1958,6 @@ 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) { if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5) diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h index 27fe66a279b1..a6ef9cc267ec 100644 --- a/include/linux/ceph/decode.h +++ b/include/linux/ceph/decode.h @@ -8,25 +8,6 @@ #include -/* 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)) -#define U64_MAX ((u64)(~0ULL)) - -#define S8_MAX ((s8)(U8_MAX >> 1)) -#define S16_MAX ((s16)(U16_MAX >> 1)) -#define S32_MAX ((s32)(U32_MAX >> 1)) -#define S64_MAX ((s64)(U64_MAX >> 1LL)) - -#define S8_MIN ((s8)(-S8_MAX - 1)) -#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, * void **p pointer to position pointer diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c index ffb2615d286f..86183c4e4fd5 100644 --- a/net/ipv4/tcp_illinois.c +++ b/net/ipv4/tcp_illinois.c @@ -23,9 +23,6 @@ #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