summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGowtham Tammana2017-02-13 15:24:08 -0600
committerGowtham Tammana2017-02-15 14:42:51 -0600
commit030df5ecf503ef3c83dca6e732e6d47d4a11cd4b (patch)
tree225b7a6db146fda34a097082d7a9a272b6656b8f
parentaa10cb2c1fd22664df29825f1d40742b3964e481 (diff)
downloadti-gc320-driver-030df5ecf503ef3c83dca6e732e6d47d4a11cd4b.tar.gz
ti-gc320-driver-030df5ecf503ef3c83dca6e732e6d47d4a11cd4b.tar.xz
ti-gc320-driver-030df5ecf503ef3c83dca6e732e6d47d4a11cd4b.zip
km: Get rid of PAGE_CACHE_* and page_cache_release macros
With the following k4.9-rc3 commits PAGE_CACHE_* and page_cache_{get,release} macros are removed and PAGE_* and {get,put}_page equivalents are used instead. Kirill A. Shutemov (3): 1fa64f1 mm: drop PAGE_CACHE_* and page_cache_{get,release} definition ea1754a mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage 09cbfea mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
-rwxr-xr-xsrc/hal/os/linux/kernel/gc_hal_kernel_linux.h2
-rwxr-xr-xsrc/hal/os/linux/kernel/gc_hal_kernel_os.c6
-rwxr-xr-xsrc/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/hal/os/linux/kernel/gc_hal_kernel_linux.h b/src/hal/os/linux/kernel/gc_hal_kernel_linux.h
index b863784..d8b23fe 100755
--- a/src/hal/os/linux/kernel/gc_hal_kernel_linux.h
+++ b/src/hal/os/linux/kernel/gc_hal_kernel_linux.h
@@ -118,7 +118,7 @@
118# define CLASS_NAME "graphics_class" 118# define CLASS_NAME "graphics_class"
119#endif 119#endif
120 120
121#define GetPageCount(size, offset) ((((size) + ((offset) & ~PAGE_CACHE_MASK)) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) 121#define GetPageCount(size, offset) ((((size) + ((offset) & ~PAGE_MASK)) + PAGE_SIZE - 1) >> PAGE_SHIFT)
122 122
123#if LINUX_VERSION_CODE >= KERNEL_VERSION (3,7,0) 123#if LINUX_VERSION_CODE >= KERNEL_VERSION (3,7,0)
124#define gcdVM_FLAGS (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_DONTDUMP) 124#define gcdVM_FLAGS (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_DONTDUMP)
diff --git a/src/hal/os/linux/kernel/gc_hal_kernel_os.c b/src/hal/os/linux/kernel/gc_hal_kernel_os.c
index 0baa4ca..2b477df 100755
--- a/src/hal/os/linux/kernel/gc_hal_kernel_os.c
+++ b/src/hal/os/linux/kernel/gc_hal_kernel_os.c
@@ -4766,7 +4766,7 @@ OnError:
4766 break; 4766 break;
4767 } 4767 }
4768 4768
4769 page_cache_release(pages[i]); 4769 put_page(pages[i]);
4770 pages[i] = gcvNULL; 4770 pages[i] = gcvNULL;
4771 } 4771 }
4772 4772
@@ -5093,7 +5093,7 @@ OnError:
5093 { 5093 {
5094 break; 5094 break;
5095 } 5095 }
5096 page_cache_release(pages[i]); 5096 put_page(pages[i]);
5097 } 5097 }
5098 } 5098 }
5099 5099
@@ -5301,7 +5301,7 @@ OnError:
5301 5301
5302 if (pfn_valid(page_to_pfn(pages[i]))) 5302 if (pfn_valid(page_to_pfn(pages[i])))
5303 { 5303 {
5304 page_cache_release(pages[i]); 5304 put_page(pages[i]);
5305 } 5305 }
5306 } 5306 }
5307 } 5307 }
diff --git a/src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c b/src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c
index 015e67c..9a7955f 100755
--- a/src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c
+++ b/src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c
@@ -367,7 +367,7 @@ cache_op_on_logical(gctPOINTER logical, gctSIZE_T bytes,
367 if (pages[i] == gcvNULL) 367 if (pages[i] == gcvNULL)
368 break; 368 break;
369 369
370 page_cache_release(pages[i]); 370 put_page(pages[i]);
371 pages[i] = gcvNULL; 371 pages[i] = gcvNULL;
372 } 372 }
373 numPagesMapped = 0; 373 numPagesMapped = 0;