Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 067d14f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc updates from David Miller:
 "Just a bunch of small cleanups and fixes here, and support for user
  probes from Allen Pais"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix a building error reported by kbuild
  sparc64: fix typo in pgd_clear()
  sparc64: restore irq in error paths in iommu
  sparc: leon: Fix a retry loop in leon_init_timers()
  sparc64: make string buffers large enough
  sparc64: move dereference after check for NULL
  sparc: kernel: use builtin_platform_driver
  sparc64:Support User Probes for sparc
parents ce38aa9c 541cc394

arch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ config KPROBES_ON_FTRACE 


config UPROBES

	def_bool n

	depends on ARCH_SUPPORTS_UPROBES

	help

	  Uprobes is the user-space counterpart to kprobes: they

	  enable instrumentation applications (such as 'perf probe')

arch/sparc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ config PGTABLE_LEVELS 
	default 4 if 64BIT

	default 3



config ARCH_SUPPORTS_UPROBES

	def_bool y if SPARC64



source "init/Kconfig"



source "kernel/Kconfig.freezer"

arch/sparc/configs/sparc64_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ CONFIG_SCHEDSTATS=y 
# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENTS=y

CONFIG_KEYS=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_TEST=m

arch/sparc/include/asm/kdebug_64.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ enum die_val { 
	DIE_OOPS = 1,

	DIE_DEBUG,	/* ta 0x70 */

	DIE_DEBUG_2,	/* ta 0x71 */

	DIE_BPT,	/* ta 0x73 */

	DIE_SSTEP,	/* ta 0x74 */

	DIE_DIE,

	DIE_TRAP,

	DIE_TRAP_TL1,

arch/sparc/include/asm/pgtable_64.h

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static inline unsigned long __pmd_page(pmd_t pmd) 
#define pgd_page_vaddr(pgd)		\

	((unsigned long) __va(pgd_val(pgd)))

#define pgd_present(pgd)		(pgd_val(pgd) != 0U)

#define pgd_clear(pgdp)			(pgd_val(*(pgd)) = 0UL)

#define pgd_clear(pgdp)			(pgd_val(*(pgdp)) = 0UL)



static inline unsigned long pud_large(pud_t pud)

{