Commit d3511f53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "Many great new features, fixes and optimizations, including:

   - Convert page table updates to use per-pagetable spinlocks which
     overall improves performance on SMP machines a lot, by Mikulas
     Patocka

   - Kernel debugger (KGDB) support, by Sven Schnelle

   - KPROBES support, by Sven Schnelle

   - Lots of TLB lock/flush improvements, by Dave Anglin

   - Drop DISCONTIGMEM and switch to SPARSEMEM

   - Added JUMP_LABEL, branch runtime-patching support

   - Lots of other small speedups and cleanups, e.g. for QEMU, stack
     randomization, avoidance of name clashes, documentation updates,
     etc ..."

* 'parisc-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: (28 commits)
  parisc: Add static branch and JUMP_LABEL feature
  parisc: Use PA_ASM_LEVEL in boot code
  parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
  parisc: Update huge TLB page support to use per-pagetable spinlock
  parisc: Use per-pagetable spinlock
  parisc: Allow live-patching of __meminit functions
  parisc: Add memory barrier to asm pdc and sync instructions
  parisc: Add memory clobber to TLB purges
  parisc: Use ldcw instruction for SMP spinlock release barrier
  parisc: Remove lock code to serialize TLB operations in pacache.S
  parisc: Switch from DISCONTIGMEM to SPARSEMEM
  parisc: enable wide mode early
  parisc: update feature lists
  parisc: Show n/a if product number not available
  parisc: remove unused flags parameter in __patch_text()
  doc: update kprobes supported architecture list
  parisc: Implement kretprobes
  parisc: remove kprobes.h from generic-y
  parisc: Implement kprobes
  parisc: add functions required by KPROBE_EVENTS
  ...
parents 02aff8db 62217beb

Documentation/features/debug/kgdb/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    |       nds32: | TODO |

    |       nios2: |  ok  |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |        s390: | TODO |

Documentation/features/debug/kprobes/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    |       nds32: | TODO |

    |       nios2: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: |  ok  |

    |        s390: |  ok  |

Documentation/features/debug/kretprobes/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    |       nds32: | TODO |

    |       nios2: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |        s390: |  ok  |

Documentation/kprobes.txt

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ architectures: 
- ppc

- mips

- s390

- parisc



Configuring Kprobes

===================

arch/parisc/Kconfig

+9 −8
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ config PARISC 
	select GENERIC_STRNCPY_FROM_USER

	select SYSCTL_ARCH_UNALIGN_ALLOW

	select SYSCTL_EXCEPTION_TRACE

	select ARCH_DISCARD_MEMBLOCK

	select HAVE_MOD_ARCH_SPECIFIC

	select VIRT_TO_BUS

	select MODULES_USE_ELF_RELA
@@ -44,6 +45,8 @@ config PARISC 
	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_HASH

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_REGS_AND_STACK_ACCESS_API
@@ -54,6 +57,9 @@ config PARISC 
	select CPU_NO_EFFICIENT_FFS

	select NEED_DMA_MAP_STATE

	select NEED_SG_DMA_LENGTH

	select HAVE_ARCH_KGDB

	select HAVE_KPROBES

	select HAVE_KRETPROBES



	help

	  The PA-RISC microprocessor is designed by Hewlett-Packard and used
@@ -305,21 +311,16 @@ config ARCH_SELECT_MEMORY_MODEL 
	def_bool y

	depends on 64BIT



config ARCH_DISCONTIGMEM_ENABLE

config ARCH_SPARSEMEM_ENABLE

	def_bool y

	depends on 64BIT



config ARCH_FLATMEM_ENABLE

	def_bool y



config ARCH_DISCONTIGMEM_DEFAULT

config ARCH_SPARSEMEM_DEFAULT

	def_bool y

	depends on ARCH_DISCONTIGMEM_ENABLE



config NODES_SHIFT

	int

	default "3"

	depends on NEED_MULTIPLE_NODES

	depends on ARCH_SPARSEMEM_ENABLE



source "kernel/Kconfig.hz"

CRA Git | Maintained and supported by SUSTech CRA and CCSE