projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
power: rk818 charger: remove suspend and resume callback
[firefly-linux-kernel-4.4.55.git]
/
mm
/
cma.c
diff --git
a/mm/cma.c
b/mm/cma.c
index 4eb56badf37e60e63a5a1badd093d1934a21ad35..ea506eb18cd6b2cff00606a6c1e1387b48099ffa 100644
(file)
--- a/
mm/cma.c
+++ b/
mm/cma.c
@@
-363,7
+363,9
@@
err:
*/
struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align)
{
*/
struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align)
{
- unsigned long mask, offset, pfn, start = 0;
+ unsigned long mask, offset;
+ unsigned long pfn = -1;
+ unsigned long start = 0;
unsigned long bitmap_maxno, bitmap_no, bitmap_count;
struct page *page = NULL;
int ret;
unsigned long bitmap_maxno, bitmap_no, bitmap_count;
struct page *page = NULL;
int ret;
@@
-418,7
+420,7
@@
struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align)
start = bitmap_no + mask + 1;
}
start = bitmap_no + mask + 1;
}
- trace_cma_alloc(p
age ? pfn : -1UL
, page, count, align);
+ trace_cma_alloc(p
fn
, page, count, align);
pr_debug("%s(): returned %p\n", __func__, page);
return page;
pr_debug("%s(): returned %p\n", __func__, page);
return page;