Commit f58d3410 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4ea3c642 94865e2d

drivers/misc/habanalabs/common/memory.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -111,10 +111,10 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args, 




	if (contiguous) {

	if (contiguous) {

		if (is_power_of_2(page_size))

		if (is_power_of_2(page_size))

			paddr = (u64) (uintptr_t) gen_pool_dma_alloc_align(vm->dram_pg_pool,

			paddr = (uintptr_t) gen_pool_dma_alloc_align(vm->dram_pg_pool,

								     total_size, NULL, page_size);

								     total_size, NULL, page_size);

		else

		else

			paddr = (u64) (uintptr_t) gen_pool_alloc(vm->dram_pg_pool, total_size);

			paddr = gen_pool_alloc(vm->dram_pg_pool, total_size);

		if (!paddr) {

		if (!paddr) {

			dev_err(hdev->dev,

			dev_err(hdev->dev,

				"failed to allocate %llu contiguous pages with total size of %llu\n",

				"failed to allocate %llu contiguous pages with total size of %llu\n",
@@ -150,11 +150,11 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args, 
		for (i = 0 ; i < num_pgs ; i++) {

		for (i = 0 ; i < num_pgs ; i++) {

			if (is_power_of_2(page_size))

			if (is_power_of_2(page_size))

				phys_pg_pack->pages[i] =

				phys_pg_pack->pages[i] =

						(u64) gen_pool_dma_alloc_align(vm->dram_pg_pool,

					(uintptr_t)gen_pool_dma_alloc_align(vm->dram_pg_pool,

									    page_size, NULL,

									    page_size, NULL,

									    page_size);

									    page_size);

			else

			else

				phys_pg_pack->pages[i] = (u64) gen_pool_alloc(vm->dram_pg_pool,

				phys_pg_pack->pages[i] = gen_pool_alloc(vm->dram_pg_pool,

									page_size);

									page_size);

			if (!phys_pg_pack->pages[i]) {

			if (!phys_pg_pack->pages[i]) {

				dev_err(hdev->dev,

				dev_err(hdev->dev,