tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'char-misc-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fix from Greg KH:
"A single driver fix. It resolves the build warning issue on 32bit
systems in the habannalabs driver that came in during the 5.18-rc1
merge cycle.

It has been in linux-next for all this week with no reported problems"

* tag 'char-misc-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
habanalabs: Fix test build failures

Linus Torvalds f58d3410 4ea3c642

options
unified split
Changed files
+8 -8
drivers
misc
habanalabs
common
memory.c
+8 -8
drivers/misc/habanalabs/common/memory.c
··· 111 111 112 112 if (contiguous) { 113 113 if (is_power_of_2(page_size)) 114 - paddr = (u64) (uintptr_t) gen_pool_dma_alloc_align(vm->dram_pg_pool, 115 - total_size, NULL, page_size); 114 + paddr = (uintptr_t) gen_pool_dma_alloc_align(vm->dram_pg_pool, 115 + total_size, NULL, page_size); 116 116 else 117 - paddr = (u64) (uintptr_t) gen_pool_alloc(vm->dram_pg_pool, total_size); 117 + paddr = gen_pool_alloc(vm->dram_pg_pool, total_size); 118 118 if (!paddr) { 119 119 dev_err(hdev->dev, 120 120 "failed to allocate %llu contiguous pages with total size of %llu\n", ··· 150 150 for (i = 0 ; i < num_pgs ; i++) { 151 151 if (is_power_of_2(page_size)) 152 152 phys_pg_pack->pages[i] = 153 - (u64) gen_pool_dma_alloc_align(vm->dram_pg_pool, 154 - page_size, NULL, 155 - page_size); 153 + (uintptr_t)gen_pool_dma_alloc_align(vm->dram_pg_pool, 154 + page_size, NULL, 155 + page_size); 156 156 else 157 - phys_pg_pack->pages[i] = (u64) gen_pool_alloc(vm->dram_pg_pool, 158 - page_size); 157 + phys_pg_pack->pages[i] = gen_pool_alloc(vm->dram_pg_pool, 158 + page_size); 159 159 if (!phys_pg_pack->pages[i]) { 160 160 dev_err(hdev->dev, 161 161 "Failed to allocate device memory (out of memory)\n");