From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Fri, 23 Sep 2016 00:52:50 +0000 (-0700)
Subject: Merge branch topic/uek-4.1/sparc of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~74
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=659504c594ce7e2a5593e0504709d4c19accae58;p=users%2Fjedix%2Flinux-maple.git

Merge branch topic/uek-4.1/sparc of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1
---

659504c594ce7e2a5593e0504709d4c19accae58
diff --cc arch/sparc/Kconfig
index beada789d489c,2d976677c5115..b29233d496815
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -158,9 -158,9 +158,12 @@@ config PGTABLE_LEVEL
  	default 4 if 64BIT
  	default 3
  
 +config ARCH_SUPPORTS_DTRACE
 +	def_bool y if SPARC64
 +
+ config ARCH_SUPPORTS_UPROBES
+ 	def_bool y if SPARC64
+ 
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"