]> www.infradead.org Git - users/jedix/linux-maple.git/commit
fix-up code base for v4.1.12-46 merge
authorChuck Anderson <chuck.anderson@oracle.com>
Mon, 30 May 2016 10:03:02 +0000 (03:03 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 30 May 2016 10:03:02 +0000 (03:03 -0700)
commit5075a47f3765e778b45367ba4873c1bd08b21d0e
tree8c74023d2112e153e4cbb588730826baee68b352
parent7133b0742f9833e5d7482d6d997ffddfd12545a6
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>
arch/sparc/mm/fault_64.c