public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-01 09:13:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

staging: zsmalloc: Fix link error on ARM

Browse source 
Testing the arm chromebook config against the upstream
kernel produces a linker error for the zsmalloc module from
staging. The symbol flush_tlb_kernel_range is not available
there. Fix this by removing the reimplementation of
unmap_kernel_range in the zsmalloc module and using the
function directly. The unmap_kernel_range function is not
usable by modules, so also disallow building the driver as a
module for now.

Cc: stable <stable@vger.kernel.org>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joerg Roedel 2013-03-27 01:43:14 +01:00 • committed by Greg Kroah-Hartman
parent ab4a640efb
commit d95abbbb29
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/zsmalloc/Kconfig
View file

@ -1,5 +1,5 @@
config ZSMALLOC config ZSMALLOC
tristate "Memory allocator for compressed pages" bool "Memory allocator for compressed pages"
default n default n
help help
zsmalloc is a slab-based memory allocator designed to store zsmalloc is a slab-based memory allocator designed to store

5
drivers/staging/zsmalloc/zsmalloc-main.c
View file

@ -656,11 +656,8 @@ static inline void __zs_unmap_object(struct mapping_area *area,
struct page *pages[2], int off, int size) struct page *pages[2], int off, int size)
{ {
unsigned long addr = (unsigned long)area->vm_addr; unsigned long addr = (unsigned long)area->vm_addr;
unsigned long end = addr + (PAGE_SIZE * 2);
flush_cache_vunmap(addr, end); unmap_kernel_range(addr, PAGE_SIZE * 2);
unmap_kernel_range_noflush(addr, PAGE_SIZE * 2);
flush_tlb_kernel_range(addr, end);
} }
#else /* USE_PGTABLE_MAPPING */ #else /* USE_PGTABLE_MAPPING */