diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 14:52:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 14:52:07 +1100 |
| commit | abf3208a5392a47a17711cd8b4502d5c9b07c64f (patch) | |
| tree | 26022f578ed63ab05f8e3f639309888008558441 /drivers/staging/android/ion/ion_system_heap.c | |
| parent | a1cfa885bb22689f348185f5944ebe8ba0348bf8 (diff) | |
| parent | 379c80d931fec0edccb6ee39d8122b53ebb5c602 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'drivers/staging/android/ion/ion_system_heap.c')
| -rw-r--r-- | drivers/staging/android/ion/ion_system_heap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index 548bb02c0ca6..6cb0eebdff89 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -110,7 +110,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap, unsigned long size_remaining = PAGE_ALIGN(size); unsigned int max_order = orders[0]; - if (size / PAGE_SIZE > totalram_pages / 2) + if (size / PAGE_SIZE > totalram_pages() / 2) return -ENOMEM; INIT_LIST_HEAD(&pages); |