diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-02 09:43:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-02 09:43:39 +0200 |
| commit | b429f71bca5a4ddd914350a39572692e2ea211e0 (patch) | |
| tree | 50cee6fb7b114ad89c778de87bcb44972b7326f5 /arch/hexagon/kernel | |
| parent | ace8031099f91480799b5929b4cccf2dcacc5136 (diff) | |
| parent | 6fd98e775f24fd41520928d345f5db3ff52bb35d (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/hexagon/kernel')
| -rw-r--r-- | arch/hexagon/kernel/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/kernel/dma.c b/arch/hexagon/kernel/dma.c index 77459df34e2e..7ebe7ad19d15 100644 --- a/arch/hexagon/kernel/dma.c +++ b/arch/hexagon/kernel/dma.c @@ -60,7 +60,7 @@ static void *hexagon_dma_alloc_coherent(struct device *dev, size_t size, panic("Can't create %s() memory pool!", __func__); else gen_pool_add(coherent_pool, - pfn_to_virt(max_low_pfn), + (unsigned long)pfn_to_virt(max_low_pfn), hexagon_coherent_pool_size, -1); } |