From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Mon, 30 May 2016 10:03:02 +0000 (-0700)
Subject: fix-up code base for v4.1.12-46 merge
X-Git-Tag: v4.1.12-92~147^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5075a47f3765e778b45367ba4873c1bd08b21d0e;p=users%2Fjedix%2Flinux-maple.git

fix-up code base for v4.1.12-46 merge

Orabug: 22729791

Commit:
	bd52d0fd57c96146f8d1838588753ab9dabcd2fe:
	sparc64: Log warning for invalid hugepages boot param
Removes "#include <linux/dtrace_os.h>" from arch/sparc/mm/fault_64.c.

The topic/uek-4.1/sparc code base has:
    #include <linux/context_tracking.h>
    #include <linux/hugetlb.h>
    #include <linux/dtrace_os.h>

v4.1.12-46 has:
    #include <linux/context_tracking.h>
    #include <linux/dtrace_os.h>

Remove "#include <linux/hugetlb.h>" so that bd52d0fd57 will merge with
v4.1.12-46.

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 8d0a27fdee9ae..181e933e8c881 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -22,7 +22,6 @@
 #include <linux/kdebug.h>
 #include <linux/percpu.h>
 #include <linux/context_tracking.h>
-#include <linux/hugetlb.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>