]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
powerpc/drmem: Make lmb_size 64 bit
authorAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Wed, 7 Oct 2020 11:48:33 +0000 (17:18 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Nov 2020 10:43:30 +0000 (11:43 +0100)
commit ec72024e35dddb88a81e40071c87ceb18b5ee835 upstream.

Similar to commit 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic")
make sure different variables tracking lmb_size are updated to be 64 bit.

This was found by code audit.

Cc: stable@vger.kernel.org
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Acked-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201007114836.282468-2-aneesh.kumar@linux.ibm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/include/asm/drmem.h

index bea7a2405ba5d3e41c2a4ca085965dc8a14e4df2..ee61542c6c3d9c1d6b681a2199fed7f1b5f33767 100644 (file)
@@ -20,7 +20,7 @@ struct drmem_lmb {
 struct drmem_lmb_info {
        struct drmem_lmb        *lmbs;
        int                     n_lmbs;
-       u32                     lmb_size;
+       u64                     lmb_size;
 };
 
 extern struct drmem_lmb_info *drmem_info;
@@ -79,7 +79,7 @@ struct of_drconf_cell_v2 {
 #define DRCONF_MEM_AI_INVALID  0x00000040
 #define DRCONF_MEM_RESERVED    0x00000080
 
-static inline u32 drmem_lmb_size(void)
+static inline u64 drmem_lmb_size(void)
 {
        return drmem_info->lmb_size;
 }