Merge tag 'imx-soc-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

[cascardo/linux.git] / mm / page_cgroup.c

diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index cfd1628..3708264 100644 (file)
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -175,7 +175,7 @@ static void free_page_cgroup(void *addr)
        }
 }
 
-void __free_page_cgroup(unsigned long pfn)
+static void __free_page_cgroup(unsigned long pfn)
 {
        struct mem_section *ms;
        struct page_cgroup *base;
@@ -188,9 +188,9 @@ void __free_page_cgroup(unsigned long pfn)
        ms->page_cgroup = NULL;
 }
 
-int __meminit online_page_cgroup(unsigned long start_pfn,
-                       unsigned long nr_pages,
-                       int nid)
+static int __meminit online_page_cgroup(unsigned long start_pfn,
+                               unsigned long nr_pages,
+                               int nid)
 {
        unsigned long start, end, pfn;
        int fail = 0;
@@ -223,8 +223,8 @@ int __meminit online_page_cgroup(unsigned long start_pfn,
        return -ENOMEM;
 }
 
-int __meminit offline_page_cgroup(unsigned long start_pfn,
-               unsigned long nr_pages, int nid)
+static int __meminit offline_page_cgroup(unsigned long start_pfn,
+                               unsigned long nr_pages, int nid)
 {
        unsigned long start, end, pfn;