]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fix-up - add back include of linux/hugetlb.h
authorChuck Anderson <chuck.anderson@oracle.com>
Wed, 1 Jun 2016 00:58:52 +0000 (17:58 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 1 Jun 2016 00:58:52 +0000 (17:58 -0700)
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>
arch/sparc/mm/fault_64.c

index 832c2795ca8991e1b6cf75e136490122f1c84302..13a645eac73fd590cbbc5e70ab6b050afc55a684 100644 (file)
@@ -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>