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-- 4.1 KB
Makefile -rw-r--r-- 774 bytes
font_10x18.c -rw-r--r-- 140.6 KB
font_6x10.c -rw-r--r-- 60.8 KB
font_6x11.c -rw-r--r-- 66.6 KB
font_7x14.c -rw-r--r-- 79.3 KB
font_8x16.c -rw-r--r-- 93.9 KB
font_8x8.c -rw-r--r-- 49.9 KB
font_acorn_8x8.c -rw-r--r-- 15.7 KB
font_mini_4x6.c -rw-r--r-- 54.6 KB
font_pearl_8x8.c -rw-r--r-- 54.6 KB
font_sun12x22.c -rw-r--r-- 181.5 KB
font_sun8x16.c -rw-r--r-- 22.1 KB
font_ter16x32.c -rw-r--r-- 100.8 KB
fonts.c -rw-r--r-- 3.1 KB

back to top