Commit 23ef827c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.15/parisc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fixes from Helge Deller:

 - Build warning fixes in Makefile and Dino PCI driver

 - Fix when sched_clock is marked unstable

 - Drop strnlen_user() in favour of generic version

 - Prevent kernel to write outside userspace signal stack

 - Remove CONFIG_SET_FS including KERNEL_DS and USER_DS from parisc and
   switch to __get/put_kernel_nofault()

* tag 'for-5.15/parisc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Implement __get/put_kernel_nofault()
  parisc: Mark sched_clock unstable only if clocks are not syncronized
  parisc: Move pci_dev_is_behind_card_dino to where it is used
  parisc: Reduce sigreturn trampoline to 3 instructions
  parisc: Check user signal stack trampoline is inside TASK_SIZE
  parisc: Drop useless debug info and comments from signal.c
  parisc: Drop strnlen_user() in favour of generic version
  parisc: Add missing FORCE prerequisite in Makefile
parents 589e5cab 67102872

arch/parisc/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config PARISC 
	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAS_STRNLEN_USER

	select ARCH_NO_SG_CHAIN

	select ARCH_SUPPORTS_HUGETLBFS if PA20

	select ARCH_SUPPORTS_MEMORY_FAILURE
@@ -65,7 +64,6 @@ config PARISC 
	select HAVE_KPROBES_ON_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_SOFTIRQ_ON_OWN_STACK if IRQSTACKS

	select SET_FS

	select TRACE_IRQFLAGS_SUPPORT



	help

arch/parisc/boot/compressed/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ endif 
OBJECTS += $(obj)/head.o $(obj)/real2.o $(obj)/firmware.o $(obj)/misc.o $(obj)/piggy.o



LDFLAGS_vmlinux := -X -e startup --as-needed -T

$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS) $(LIBGCC)

$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS) $(LIBGCC) FORCE

	$(call if_changed,ld)



sed-sizes := -e 's/^\([0-9a-fA-F]*\) . \(__bss_start\|_end\|parisc_kernel_start\)$$/\#define SZ\2 0x\1/p'
@@ -34,7 +34,7 @@ sed-sizes := -e 's/^\([0-9a-fA-F]*\) . \(__bss_start\|_end\|parisc_kernel_start\ 
quiet_cmd_sizes = GEN $@

      cmd_sizes = $(NM) $< | sed -n $(sed-sizes) > $@



$(obj)/sizes.h: vmlinux

$(obj)/sizes.h: vmlinux FORCE

	$(call if_changed,sizes)



AFLAGS_head.o += -I$(objtree)/$(obj) -DBOOTLOADER
@@ -70,19 +70,19 @@ suffix-$(CONFIG_KERNEL_LZMA) := lzma 
suffix-$(CONFIG_KERNEL_LZO)  := lzo

suffix-$(CONFIG_KERNEL_XZ)  := xz



$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y)

$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,gzip)

$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y)

$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,bzip2)

$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y)

$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,lz4)

$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y)

$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,lzma)

$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y)

$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,lzo)

$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y)

$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,xzkern)



LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T

$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y)

$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE

	$(call if_changed,ld)

arch/parisc/include/asm/processor.h

+0 −4
Original line number Diff line number Diff line
@@ -101,10 +101,6 @@ DECLARE_PER_CPU(struct cpuinfo_parisc, cpu_data); 


#define CPU_HVERSION ((boot_cpu_data.hversion >> 4) & 0x0FFF)



typedef struct {

	int seg;  

} mm_segment_t;



#define ARCH_MIN_TASKALIGN	8



struct thread_struct {

arch/parisc/include/asm/rt_sigframe.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef _ASM_PARISC_RT_SIGFRAME_H

#define _ASM_PARISC_RT_SIGFRAME_H



#define SIGRETURN_TRAMP 4

#define SIGRETURN_TRAMP 3

#define SIGRESTARTBLOCK_TRAMP 5 

#define TRAMP_SIZE (SIGRETURN_TRAMP + SIGRESTARTBLOCK_TRAMP)

arch/parisc/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
struct thread_info {

	struct task_struct *task;	/* main task structure */

	unsigned long flags;		/* thread_info flags (see TIF_*) */

	mm_segment_t addr_limit;	/* user-level address space limit */

	__u32 cpu;			/* current CPU */

	int preempt_count;		/* 0=premptable, <0=BUG; will also serve as bh-counter */

};
@@ -21,7 +20,6 @@ struct thread_info { 
	.task		= &tsk,			\

	.flags		= 0,			\

	.cpu		= 0,			\

	.addr_limit	= KERNEL_DS,		\

	.preempt_count	= INIT_PREEMPT_COUNT,	\

}