Commit 3bb48a85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull parisc fixes from Helge Deller:
 "Two small parisc architecture fixes: fix a linking failure reported by
  the kernel test robot and remove a duplicate include"

* 'parisc-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  arch/parisc/kernel: remove duplicate include in ptrace
  parisc: Enable -mlong-calls gcc option with CONFIG_COMPILE_TEST
parents fbda7904 460c9f1c

arch/parisc/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -203,9 +203,12 @@ config PREFETCH 
	def_bool y

	depends on PA8X00 || PA7200



config PARISC_HUGE_KERNEL

	def_bool y if !MODULES || UBSAN || FTRACE || COMPILE_TEST



config MLONGCALLS

	def_bool y if !MODULES || UBSAN || FTRACE

	bool "Enable the -mlong-calls compiler option for big kernels" if MODULES && !UBSAN && !FTRACE

	def_bool y if PARISC_HUGE_KERNEL

	bool "Enable the -mlong-calls compiler option for big kernels" if !PARISC_HUGE_KERNEL

	depends on PA8X00

	help

	  If you configure the kernel to include many drivers built-in instead

arch/parisc/kernel/ptrace.c

+0 −2
Original line number Diff line number Diff line
@@ -567,8 +567,6 @@ static const struct user_regset_view user_parisc_native_view = { 
};



#ifdef CONFIG_64BIT

#include <linux/compat.h>



static int gpr32_get(struct task_struct *target,

		     const struct user_regset *regset,

		     struct membuf to)