From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759131AbdEVLSq (ORCPT ); Mon, 22 May 2017 07:18:46 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:52376 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759116AbdEVLSp (ORCPT ); Mon, 22 May 2017 07:18:45 -0400 From: Anshuman Khandual To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org Subject: [PATCH] mm: Define KB, MB, GB, TB in core VM Date: Mon, 22 May 2017 16:47:42 +0530 X-Mailer: git-send-email 2.9.3 X-TM-AS-MML: disable x-cbid: 17052211-0052-0000-0000-00000242174E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17052211-0053-0000-0000-0000081E9025 Message-Id: <20170522111742.29433-1-khandual@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-22_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705220060 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are many places where we define size either left shifting integers or multiplying 1024s without any generic definition to fall back on. But there are couples of (powerpc and lz4) attempts to define these standard memory sizes. Lets move these definitions to core VM to make sure that all new usage come from these definitions eventually standardizing it across all places. Signed-off-by: Anshuman Khandual --- arch/powerpc/mm/hash_utils_64.c | 4 ---- include/linux/mm.h | 5 +++++ lib/lz4/lz4defs.h | 5 +---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index f2095ce..ef64040 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -74,10 +74,6 @@ #define DBG_LOW(fmt...) #endif -#define KB (1024) -#define MB (1024*KB) -#define GB (1024L*MB) - /* * Note: pte --> Linux PTE * HPTE --> PowerPC Hashed Page Table Entry diff --git a/include/linux/mm.h b/include/linux/mm.h index 7cb17c6..9f5779f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2549,5 +2549,10 @@ static inline bool page_is_guard(struct page *page) static inline void setup_nr_node_ids(void) {} #endif +#define KB (1UL << 10) +#define MB (1UL << 20) +#define GB (1UL << 30) +#define TB (1UL << 40) + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ diff --git a/lib/lz4/lz4defs.h b/lib/lz4/lz4defs.h index 00a0b58..67a0f6d 100644 --- a/lib/lz4/lz4defs.h +++ b/lib/lz4/lz4defs.h @@ -37,6 +37,7 @@ #include #include /* memset, memcpy */ +#include #define FORCE_INLINE __always_inline @@ -81,10 +82,6 @@ #define HASH_UNIT sizeof(size_t) -#define KB (1 << 10) -#define MB (1 << 20) -#define GB (1U << 30) - #define MAXD_LOG 16 #define MAX_DISTANCE ((1 << MAXD_LOG) - 1) #define STEPSIZE sizeof(size_t) -- 1.8.5.2