| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20180926112744.GC4628@rapoport-lnx>
Date: Wed, 26 Sep 2018 14:27:45 +0300
From: Mike Rapoport <rppt@...ux.vnet.ibm.com>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Michal Hocko <mhocko@...nel.org>, Guo Ren <ren_guo@...ky.com>,
linux-mm@...ck.org, linux-kernel@...r.kernel.org
Subject: [PATCH] csky: fixups after bootmem removal
Hi,
The below patch fixes the bootmem leftovers in csky. It is based on the
current mmots and csky build there fails because of undefined reference to
dma_direct_ops:
MODPOST vmlinux.o
kernel/dma/mapping.o: In function `dmam_alloc_attrs':
kernel/dma/mapping.c:143: undefined reference to `dma_direct_ops'
kernel/dma/mapping.o: In function `dmam_declare_coherent_memory':
kernel/dma/mapping.c:184: undefined reference to `dma_direct_ops'
mm/dmapool.o: In function `dma_free_attrs':
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@...ux.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@...ux.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.
Powered by blists - more mailing lists