Revision 8bc086899816214fbc6047c9c7e15fcab49552bf authored by Ben Hutchings on 17 March 2019, 01:17:56 UTC, committed by Michael Ellerman on 20 March 2019, 13:16:45 UTC
MAX_PHYSMEM_BITS only needs to be defined if CONFIG_SPARSEMEM is
enabled, and that was the case before commit 4ffe713b7587
("powerpc/mm: Increase the max addressable memory to 2PB").

On 32-bit systems, where CONFIG_SPARSEMEM is not enabled, we now
define it as 46.  That is larger than the real number of physical
address bits, and breaks calculations in zsmalloc:

  mm/zsmalloc.c:130:49: warning: right shift count is negative
    MAX(32, (ZS_MAX_PAGES_PER_ZSPAGE << PAGE_SHIFT >> OBJ_INDEX_BITS))
                                                   ^~
  ...
  mm/zsmalloc.c:253:21: error: variably modified 'size_class' at file scope
    struct size_class *size_class[ZS_SIZE_CLASSES];
                       ^~~~~~~~~~

Fixes: 4ffe713b7587 ("powerpc/mm: Increase the max addressable memory to 2PB")
Cc: stable@vger.kernel.org # v4.20+
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
1 parent 4622a2d
History
File Mode Size
Kconfig -rw-r--r-- 5.5 KB
LICENCE -rw-r--r-- 1.4 KB
Makefile -rw-r--r-- 786 bytes
README.Locking -rw-r--r-- 6.9 KB
TODO -rw-r--r-- 1.9 KB
acl.c -rw-r--r-- 6.7 KB
acl.h -rw-r--r-- 966 bytes
background.c -rw-r--r-- 4.2 KB
build.c -rw-r--r-- 12.6 KB
compr.c -rw-r--r-- 11.6 KB
compr.h -rw-r--r-- 3.1 KB
compr_lzo.c -rw-r--r-- 2.2 KB
compr_rtime.c -rw-r--r-- 2.8 KB
compr_rubin.c -rw-r--r-- 8.7 KB
compr_zlib.c -rw-r--r-- 5.5 KB
debug.c -rw-r--r-- 25.6 KB
debug.h -rw-r--r-- 7.9 KB
dir.c -rw-r--r-- 22.6 KB
erase.c -rw-r--r-- 13.4 KB
file.c -rw-r--r-- 9.1 KB
fs.c -rw-r--r-- 19.8 KB
gc.c -rw-r--r-- 43.9 KB
ioctl.c -rw-r--r-- 557 bytes
jffs2_fs_i.h -rw-r--r-- 1.6 KB
jffs2_fs_sb.h -rw-r--r-- 5.7 KB
malloc.c -rw-r--r-- 7.3 KB
nodelist.c -rw-r--r-- 21.3 KB
nodelist.h -rw-r--r-- 17.9 KB
nodemgmt.c -rw-r--r-- 28.4 KB
os-linux.h -rw-r--r-- 7.5 KB
read.c -rw-r--r-- 6.7 KB
readinode.c -rw-r--r-- 42.9 KB
scan.c -rw-r--r-- 35.2 KB
security.c -rw-r--r-- 1.9 KB
summary.c -rw-r--r-- 23.6 KB
summary.h -rw-r--r-- 6.3 KB
super.c -rw-r--r-- 10.2 KB
symlink.c -rw-r--r-- 417 bytes
wbuf.c -rw-r--r-- 36.9 KB
write.c -rw-r--r-- 21.0 KB
writev.c -rw-r--r-- 1.1 KB
xattr.c -rw-r--r-- 38.3 KB
xattr.h -rw-r--r-- 4.1 KB
xattr_trusted.c -rw-r--r-- 1.2 KB
xattr_user.c -rw-r--r-- 1.1 KB

README.Locking

back to top