| Message ID | 1456178322-1728962-1-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c45442055dfd |
| Headers | show |
On Mon, Feb 22, 2016 at 1:58 PM, Arnd Bergmann <arnd@arndb.de> wrote: > A recent bugfix changed pfn_t to always be 64-bit wide, but did not > change the code in pmem.c, which is now broken on 32-bit architectures > as reported by gcc: > > In file included from ../drivers/nvdimm/pmem.c:28:0: > drivers/nvdimm/pmem.c: In function 'pmem_alloc': > include/linux/pfn_t.h:15:17: error: large integer implicitly truncated to unsigned type [-Werror=overflow] > #define PFN_DEV (1ULL << (BITS_PER_LONG_LONG - 3)) > > This changes the intermediate pfn_flags in struct pmem_device to > be 64 bit wide as well, so they can store the flags correctly. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: db78c22230d0 ("mm: fix pfn_t vs highmem") Thanks Arnd, I'll roll this up.
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 7edf31671dab..8d0b54670184 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -41,7 +41,7 @@ struct pmem_device { phys_addr_t phys_addr; /* when non-zero this device is hosting a 'pfn' instance */ phys_addr_t data_offset; - unsigned long pfn_flags; + u64 pfn_flags; void __pmem *virt_addr; size_t size; struct badblocks bb;
A recent bugfix changed pfn_t to always be 64-bit wide, but did not change the code in pmem.c, which is now broken on 32-bit architectures as reported by gcc: In file included from ../drivers/nvdimm/pmem.c:28:0: drivers/nvdimm/pmem.c: In function 'pmem_alloc': include/linux/pfn_t.h:15:17: error: large integer implicitly truncated to unsigned type [-Werror=overflow] #define PFN_DEV (1ULL << (BITS_PER_LONG_LONG - 3)) This changes the intermediate pfn_flags in struct pmem_device to be 64 bit wide as well, so they can store the flags correctly. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: db78c22230d0 ("mm: fix pfn_t vs highmem") --- drivers/nvdimm/pmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)