tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock
arch/powerpc/platforms/85xx/p1022_ds.c:22:23: error: linux/lmb.h: No such file or directory
arch/powerpc/platforms/85xx/p1022_ds.c: In function 'p1022_ds_setup_arch':
arch/powerpc/platforms/85xx/p1022_ds.c:100: error: implicit declaration of function 'memblock_end_of_DRAM'
arch/powerpc/platforms/85xx/p1022_ds.c: At top level:
arch/powerpc/platforms/85xx/p1022_ds.c:147: error: 'udbg_progress' undeclared here (not in a function)
make[2]: *** [arch/powerpc/platforms/85xx/p1022_ds.o] Error 1
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+2
-2
+2
-2
arch/powerpc/platforms/85xx/p1022_ds.c
+2
-2
arch/powerpc/platforms/85xx/p1022_ds.c
···
19
19
20
20
#include <linux/pci.h>
21
21
#include <linux/of_platform.h>
22
-
#include <linux/lmb.h>
22
+
#include <linux/memblock.h>
23
23
24
24
#include <asm/mpic.h>
25
25
#include <asm/swiotlb.h>
···
97
97
#endif
98
98
99
99
#ifdef CONFIG_SWIOTLB
100
-
if (lmb_end_of_DRAM() > max) {
100
+
if (memblock_end_of_DRAM() > max) {
101
101
ppc_swiotlb_enable = 1;
102
102
set_pci_dma_ops(&swiotlb_dma_ops);
103
103
ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;