diff options
| author | Joerg Roedel | 2013-03-27 01:43:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-03-29 00:08:54 +0100 |
| commit | d95abbbb291bf5bce078148f53603ce9c0aa1d44 (patch) | |
| tree | 342aeb96b675d904e4cd51c4c1c3f7aea466e318 /drivers/staging/zsmalloc/zsmalloc-main.c | |
| parent | staging: rtl8192u: fix coding style (diff) | |
| download | kernel-qcow2-linux-d95abbbb291bf5bce078148f53603ce9c0aa1d44.tar.gz kernel-qcow2-linux-d95abbbb291bf5bce078148f53603ce9c0aa1d44.tar.xz kernel-qcow2-linux-d95abbbb291bf5bce078148f53603ce9c0aa1d44.zip | |
staging: zsmalloc: Fix link error on ARM
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>
Diffstat (limited to 'drivers/staging/zsmalloc/zsmalloc-main.c')
| -rw-r--r-- | drivers/staging/zsmalloc/zsmalloc-main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c index e78d262c5249..324e123335d6 100644 --- a/drivers/staging/zsmalloc/zsmalloc-main.c +++ b/drivers/staging/zsmalloc/zsmalloc-main.c @@ -656,11 +656,8 @@ static inline void __zs_unmap_object(struct mapping_area *area, struct page *pages[2], int off, int size) { unsigned long addr = (unsigned long)area->vm_addr; - unsigned long end = addr + (PAGE_SIZE * 2); - flush_cache_vunmap(addr, end); - unmap_kernel_range_noflush(addr, PAGE_SIZE * 2); - flush_tlb_kernel_range(addr, end); + unmap_kernel_range(addr, PAGE_SIZE * 2); } #else /* USE_PGTABLE_MAPPING */ |