git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2...
[pandora-kernel.git]
/
mm
/
percpu-vm.c
diff --git
a/mm/percpu-vm.c
b/mm/percpu-vm.c
index
ea53496
..
12a48a8
100644
(file)
--- a/
mm/percpu-vm.c
+++ b/
mm/percpu-vm.c
@@
-50,14
+50,13
@@
static struct page **pcpu_get_pages_and_bitmap(struct pcpu_chunk *chunk,
if (!pages || !bitmap) {
if (may_alloc && !pages)
if (!pages || !bitmap) {
if (may_alloc && !pages)
- pages = pcpu_mem_alloc(pages_size);
+ pages = pcpu_mem_
z
alloc(pages_size);
if (may_alloc && !bitmap)
if (may_alloc && !bitmap)
- bitmap = pcpu_mem_alloc(bitmap_size);
+ bitmap = pcpu_mem_
z
alloc(bitmap_size);
if (!pages || !bitmap)
return NULL;
}
if (!pages || !bitmap)
return NULL;
}
- memset(pages, 0, pages_size);
bitmap_copy(bitmap, chunk->populated, pcpu_unit_pages);
*bitmapp = bitmap;
bitmap_copy(bitmap, chunk->populated, pcpu_unit_pages);
*bitmapp = bitmap;
@@
-143,8
+142,8
@@
static void pcpu_pre_unmap_flush(struct pcpu_chunk *chunk,
int page_start, int page_end)
{
flush_cache_vunmap(
int page_start, int page_end)
{
flush_cache_vunmap(
- pcpu_chunk_addr(chunk, pcpu_
first
_unit_cpu, page_start),
- pcpu_chunk_addr(chunk, pcpu_
last
_unit_cpu, page_end));
+ pcpu_chunk_addr(chunk, pcpu_
low
_unit_cpu, page_start),
+ pcpu_chunk_addr(chunk, pcpu_
high
_unit_cpu, page_end));
}
static void __pcpu_unmap_pages(unsigned long addr, int nr_pages)
}
static void __pcpu_unmap_pages(unsigned long addr, int nr_pages)
@@
-206,8
+205,8
@@
static void pcpu_post_unmap_tlb_flush(struct pcpu_chunk *chunk,
int page_start, int page_end)
{
flush_tlb_kernel_range(
int page_start, int page_end)
{
flush_tlb_kernel_range(
- pcpu_chunk_addr(chunk, pcpu_
first
_unit_cpu, page_start),
- pcpu_chunk_addr(chunk, pcpu_
last
_unit_cpu, page_end));
+ pcpu_chunk_addr(chunk, pcpu_
low
_unit_cpu, page_start),
+ pcpu_chunk_addr(chunk, pcpu_
high
_unit_cpu, page_end));
}
static int __pcpu_map_pages(unsigned long addr, struct page **pages,
}
static int __pcpu_map_pages(unsigned long addr, struct page **pages,
@@
-284,8
+283,8
@@
static void pcpu_post_map_flush(struct pcpu_chunk *chunk,
int page_start, int page_end)
{
flush_cache_vmap(
int page_start, int page_end)
{
flush_cache_vmap(
- pcpu_chunk_addr(chunk, pcpu_
first
_unit_cpu, page_start),
- pcpu_chunk_addr(chunk, pcpu_
last
_unit_cpu, page_end));
+ pcpu_chunk_addr(chunk, pcpu_
low
_unit_cpu, page_start),
+ pcpu_chunk_addr(chunk, pcpu_
high
_unit_cpu, page_end));
}
/**
}
/**