From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Wed, 1 Jun 2016 00:58:52 +0000 (-0700)
Subject: fix-up - add back include of linux/hugetlb.h
X-Git-Tag: v4.1.12-92~145^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=433d5cf60f383dec43693242c5ed1a2dfc5d538e;p=users%2Fjedix%2Flinux-maple.git

fix-up - add back include of linux/hugetlb.h

Orabug: 22729791

Commit:
	5075a47f3765e778b45367ba4873c1bd08b21d0e
	fix-up code base for v4.1.12-46 merge
should not have removed "#include <linux/hugetlb.h>"
Add it back in after applying adfc71b605:
    fix-up - add back include of linux/dtrace_os.h
so that it will merge with master.

Signed-off-by: Chuck Anderson <chuck.anderson@oracle.com>
---

diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 832c2795ca899..13a645eac73fd 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -23,6 +23,7 @@
 #include <linux/percpu.h>
 #include <linux/context_tracking.h>
 #include <linux/dtrace_os.h>
+#include <linux/hugetlb.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>