projects
/
platform
/
kernel
/
linux-arm64.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[platform/kernel/linux-arm64.git]
/
mm
/
memory.c
diff --git
a/mm/memory.c
b/mm/memory.c
index
5b7f200
..
833952d
100644
(file)
--- a/
mm/memory.c
+++ b/
mm/memory.c
@@
-56,6
+56,7
@@
#include <linux/kallsyms.h>
#include <linux/swapops.h>
#include <linux/elf.h>
#include <linux/kallsyms.h>
#include <linux/swapops.h>
#include <linux/elf.h>
+#include <linux/gfp.h>
#include <asm/io.h>
#include <asm/pgalloc.h>
#include <asm/io.h>
#include <asm/pgalloc.h>
@@
-124,7
+125,7
@@
core_initcall(init_zero_pfn);
#if defined(SPLIT_RSS_COUNTING)
#if defined(SPLIT_RSS_COUNTING)
-void __sync_task_rss_stat(struct task_struct *task, struct mm_struct *mm)
+
static
void __sync_task_rss_stat(struct task_struct *task, struct mm_struct *mm)
{
int i;
{
int i;