]> git.baikalelectronics.ru Git - kernel.git/commitdiff
include/linux/mmzone.h: avoid a warning in sparse memory support
authorMatthew Wilcox <willy@infradead.org>
Thu, 2 Sep 2021 21:57:10 +0000 (14:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Sep 2021 16:58:14 +0000 (09:58 -0700)
cppcheck warns that we're possibly losing information by shifting an int.
It's a false positive, because we don't allow for a NUMA node ID that
large, but if we ever change SECTION_NID_SHIFT, it could become a problem,
and in any case this is usually a legitimate warning.  Fix it by adding
the necessary cast, which makes the compiler generate the right code.

Link: https://lkml.kernel.org/r/YOya+aBZFFmC476e@casper.infradead.org
Link: https://lkml.kernel.org/r/202107130348.6LsVT9Nc-lkp@intel.com
Cc: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/sparse.c

index d85655242ed9878ef4af7d4c59b2f790e075c41b..be7936e65b6a23be7ed686d7b994584cf760722d 100644 (file)
@@ -117,7 +117,7 @@ static inline int sparse_index_init(unsigned long section_nr, int nid)
  */
 static inline unsigned long sparse_encode_early_nid(int nid)
 {
-       return (nid << SECTION_NID_SHIFT);
+       return ((unsigned long)nid << SECTION_NID_SHIFT);
 }
 
 static inline int sparse_early_nid(struct mem_section *section)