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-- 476 bytes
Makefile -rw-r--r-- 378 bytes
ast.c -rw-r--r-- 8.2 KB
ast.h -rw-r--r-- 1.3 KB
config.c -rw-r--r-- 21.6 KB
config.h -rw-r--r-- 1.5 KB
debug_fs.c -rw-r--r-- 18.5 KB
dir.c -rw-r--r-- 7.4 KB
dir.h -rw-r--r-- 1.0 KB
dlm_internal.h -rw-r--r-- 20.1 KB
lock.c -rw-r--r-- 157.5 KB
lock.h -rw-r--r-- 3.1 KB
lockspace.c -rw-r--r-- 20.5 KB
lockspace.h -rw-r--r-- 1.0 KB
lowcomms.c -rw-r--r-- 43.6 KB
lowcomms.h -rw-r--r-- 1.1 KB
lvb_table.h -rw-r--r-- 687 bytes
main.c -rw-r--r-- 2.0 KB
member.c -rw-r--r-- 16.2 KB
member.h -rw-r--r-- 1.4 KB
memory.c -rw-r--r-- 2.0 KB
memory.h -rw-r--r-- 1.0 KB
midcomms.c -rw-r--r-- 3.7 KB
midcomms.h -rw-r--r-- 864 bytes
netlink.c -rw-r--r-- 2.9 KB
plock.c -rw-r--r-- 11.6 KB
rcom.c -rw-r--r-- 15.7 KB
rcom.h -rw-r--r-- 1.1 KB
recover.c -rw-r--r-- 22.9 KB
recover.h -rw-r--r-- 1.5 KB
recoverd.c -rw-r--r-- 8.2 KB
recoverd.h -rw-r--r-- 927 bytes
requestqueue.c -rw-r--r-- 4.8 KB
requestqueue.h -rw-r--r-- 882 bytes
user.c -rw-r--r-- 24.6 KB
user.h -rw-r--r-- 586 bytes
util.c -rw-r--r-- 4.5 KB
util.h -rw-r--r-- 805 bytes

back to top