diff for duplicates of <20180926112744.GC4628@rapoport-lnx> diff --git a/a/1.txt b/N1/1.txt index c5c675b..0ea5278 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,3 +14,93 @@ include/linux/dma-mapping.h:558: undefined reference to `dma_direct_ops' I've blindly added "select DMA_DIRECT_OPS" to arch/csky/Kconfig and it fixed the build, but I really have no idea if this the right thing to do... + +From 63c3b24e661e6cad88f0432dd460d35a16741871 Mon Sep 17 00:00:00 2001 +From: Mike Rapoport <rppt@linux.vnet.ibm.com> +Date: Wed, 26 Sep 2018 13:40:13 +0300 +Subject: [PATCH] csky: fixups after bootmem removal + +The bootmem removal patchest didn't take into account csky architecture and +it still had bootmem leftovers. Remove them now. + +Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> +--- + arch/csky/Kconfig | 1 - + arch/csky/kernel/setup.c | 1 - + arch/csky/mm/highmem.c | 4 ++-- + arch/csky/mm/init.c | 3 +-- + 4 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig +index fb2a0ae..fc25ea6 100644 +--- a/arch/csky/Kconfig ++++ b/arch/csky/Kconfig +@@ -35,7 +35,6 @@ config CSKY + select HAVE_C_RECORDMCOUNT + select HAVE_DMA_API_DEBUG + select HAVE_DMA_CONTIGUOUS +- select HAVE_MEMBLOCK + select MAY_HAVE_SPARSE_IRQ + select MODULES_USE_ELF_RELA if MODULES + select OF +diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c +index 27f9e10..bee4d26 100644 +--- a/arch/csky/kernel/setup.c ++++ b/arch/csky/kernel/setup.c +@@ -3,7 +3,6 @@ + + #include <linux/console.h> + #include <linux/memblock.h> +-#include <linux/bootmem.h> + #include <linux/initrd.h> + #include <linux/of.h> + #include <linux/of_fdt.h> +diff --git a/arch/csky/mm/highmem.c b/arch/csky/mm/highmem.c +index 149921a..5b90501 100644 +--- a/arch/csky/mm/highmem.c ++++ b/arch/csky/mm/highmem.c +@@ -4,7 +4,7 @@ + #include <linux/module.h> + #include <linux/highmem.h> + #include <linux/smp.h> +-#include <linux/bootmem.h> ++#include <linux/memblock.h> + #include <asm/fixmap.h> + #include <asm/tlbflush.h> + #include <asm/cacheflush.h> +@@ -138,7 +138,7 @@ static void __init fixrange_init (unsigned long start, unsigned long end, + pmd = (pmd_t *)pud; + for (; (k < PTRS_PER_PMD) && (vaddr != end); pmd++, k++) { + if (pmd_none(*pmd)) { +- pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); ++ pte = (pte_t *) memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); + set_pmd(pmd, __pmd(__pa(pte))); + BUG_ON(pte != pte_offset_kernel(pmd, 0)); + } +diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c +index fd2791b..46c5aaa 100644 +--- a/arch/csky/mm/init.c ++++ b/arch/csky/mm/init.c +@@ -14,7 +14,6 @@ + #include <linux/ptrace.h> + #include <linux/mman.h> + #include <linux/mm.h> +-#include <linux/bootmem.h> + #include <linux/highmem.h> + #include <linux/memblock.h> + #include <linux/swap.h> +@@ -44,7 +43,7 @@ void __init mem_init(void) + #endif + high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT); + +- free_all_bootmem(); ++ memblock_free_all(); + + #ifdef CONFIG_HIGHMEM + for (tmp = highstart_pfn; tmp < highend_pfn; tmp++) { +-- +2.7.4 + +-- +Sincerely yours, +Mike. diff --git a/a/content_digest b/N1/content_digest index 1ff0271..ae78f1f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -23,6 +23,96 @@ "include/linux/dma-mapping.h:558: undefined reference to `dma_direct_ops'\n" "\n" "I've blindly added \"select DMA_DIRECT_OPS\" to arch/csky/Kconfig and it\n" - fixed the build, but I really have no idea if this the right thing to do... + "fixed the build, but I really have no idea if this the right thing to do...\n" + "\n" + "From 63c3b24e661e6cad88f0432dd460d35a16741871 Mon Sep 17 00:00:00 2001\n" + "From: Mike Rapoport <rppt@linux.vnet.ibm.com>\n" + "Date: Wed, 26 Sep 2018 13:40:13 +0300\n" + "Subject: [PATCH] csky: fixups after bootmem removal\n" + "\n" + "The bootmem removal patchest didn't take into account csky architecture and\n" + "it still had bootmem leftovers. Remove them now.\n" + "\n" + "Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>\n" + "---\n" + " arch/csky/Kconfig | 1 -\n" + " arch/csky/kernel/setup.c | 1 -\n" + " arch/csky/mm/highmem.c | 4 ++--\n" + " arch/csky/mm/init.c | 3 +--\n" + " 4 files changed, 3 insertions(+), 6 deletions(-)\n" + "\n" + "diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig\n" + "index fb2a0ae..fc25ea6 100644\n" + "--- a/arch/csky/Kconfig\n" + "+++ b/arch/csky/Kconfig\n" + "@@ -35,7 +35,6 @@ config CSKY\n" + " \tselect HAVE_C_RECORDMCOUNT\n" + " \tselect HAVE_DMA_API_DEBUG\n" + " \tselect HAVE_DMA_CONTIGUOUS\n" + "-\tselect HAVE_MEMBLOCK\n" + " \tselect MAY_HAVE_SPARSE_IRQ\n" + " \tselect MODULES_USE_ELF_RELA if MODULES\n" + " \tselect OF\n" + "diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c\n" + "index 27f9e10..bee4d26 100644\n" + "--- a/arch/csky/kernel/setup.c\n" + "+++ b/arch/csky/kernel/setup.c\n" + "@@ -3,7 +3,6 @@\n" + " \n" + " #include <linux/console.h>\n" + " #include <linux/memblock.h>\n" + "-#include <linux/bootmem.h>\n" + " #include <linux/initrd.h>\n" + " #include <linux/of.h>\n" + " #include <linux/of_fdt.h>\n" + "diff --git a/arch/csky/mm/highmem.c b/arch/csky/mm/highmem.c\n" + "index 149921a..5b90501 100644\n" + "--- a/arch/csky/mm/highmem.c\n" + "+++ b/arch/csky/mm/highmem.c\n" + "@@ -4,7 +4,7 @@\n" + " #include <linux/module.h>\n" + " #include <linux/highmem.h>\n" + " #include <linux/smp.h>\n" + "-#include <linux/bootmem.h>\n" + "+#include <linux/memblock.h>\n" + " #include <asm/fixmap.h>\n" + " #include <asm/tlbflush.h>\n" + " #include <asm/cacheflush.h>\n" + "@@ -138,7 +138,7 @@ static void __init fixrange_init (unsigned long start, unsigned long end,\n" + " \t\t\tpmd = (pmd_t *)pud;\n" + " \t\t\tfor (; (k < PTRS_PER_PMD) && (vaddr != end); pmd++, k++) {\n" + " \t\t\t\tif (pmd_none(*pmd)) {\n" + "-\t\t\t\t\tpte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);\n" + "+\t\t\t\t\tpte = (pte_t *) memblock_alloc_low(PAGE_SIZE, PAGE_SIZE);\n" + " \t\t\t\t\tset_pmd(pmd, __pmd(__pa(pte)));\n" + " \t\t\t\t\tBUG_ON(pte != pte_offset_kernel(pmd, 0));\n" + " \t\t\t\t}\n" + "diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c\n" + "index fd2791b..46c5aaa 100644\n" + "--- a/arch/csky/mm/init.c\n" + "+++ b/arch/csky/mm/init.c\n" + "@@ -14,7 +14,6 @@\n" + " #include <linux/ptrace.h>\n" + " #include <linux/mman.h>\n" + " #include <linux/mm.h>\n" + "-#include <linux/bootmem.h>\n" + " #include <linux/highmem.h>\n" + " #include <linux/memblock.h>\n" + " #include <linux/swap.h>\n" + "@@ -44,7 +43,7 @@ void __init mem_init(void)\n" + " #endif\n" + " \thigh_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);\n" + " \n" + "-\tfree_all_bootmem();\n" + "+\tmemblock_free_all();\n" + " \n" + " #ifdef CONFIG_HIGHMEM\n" + " \tfor (tmp = highstart_pfn; tmp < highend_pfn; tmp++) {\n" + "-- \n" + "2.7.4\n" + "\n" + "-- \n" + "Sincerely yours,\n" + Mike. -2ec60a05563465459a96af0694b05999141e39a257736ceb06dadaf8c1ae30c1 +5f1d4d2a7d6ddcbc924599d9abb9cd810b8e6239b5b7c519b13843f2aca25c5a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.