Commit 5ee863be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull parisc updates from Helge Deller:
 "A change to increase the default maximum stack size on parisc to 100MB
  and the ability to further increase the stack hard limit size at
  runtime with ulimit for newly started processes.

  The other patches fix compile warnings, utilize the Kbuild logic and
  cleanups the parisc arch code"

* 'parisc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: pci-dma: fix warning unused-function
  parisc/uapi: Use Kbuild logic to provide <asm/types.h>
  parisc: Make user stack size configurable
  parisc: Use _TIF_USER_WORK_MASK in entry.S
  parisc: Drop loops_per_jiffy from per_cpu struct
parents 8312f41f 39b1e779

arch/parisc/include/asm/processor.h

+2 −6
Original line number Diff line number Diff line
@@ -45,15 +45,12 @@ 
#define STACK_TOP	TASK_SIZE

#define STACK_TOP_MAX	DEFAULT_TASK_SIZE



/* Allow bigger stacks for 64-bit processes */

#define STACK_SIZE_MAX	(USER_WIDE_MODE					\

			 ? (1 << 30)	/* 1 GB */			\

			 : (CONFIG_MAX_STACK_SIZE_MB*1024*1024))



#endif



#ifndef __ASSEMBLY__



unsigned long calc_max_stack_size(unsigned long stack_max);



/*

 * Data detected about CPUs at boot time which is the same for all CPU's.

 * HP boxes are SMP - ie identical processors.
@@ -97,7 +94,6 @@ struct cpuinfo_parisc { 
	unsigned long cpu_loc;      /* CPU location from PAT firmware */

	unsigned int state;

	struct parisc_device *dev;

	unsigned long loops_per_jiffy;

};



extern struct system_cpuinfo_parisc boot_cpu_data;

arch/parisc/include/uapi/asm/types.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _PARISC_TYPES_H

#define _PARISC_TYPES_H



#include <asm-generic/int-ll64.h>



#endif

arch/parisc/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ intr_check_sig: 
	/* As above */

	mfctl   %cr30,%r1

	LDREG	TI_FLAGS(%r1),%r19

	ldi	(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME), %r20

	ldi	(_TIF_USER_WORK_MASK & ~_TIF_NEED_RESCHED), %r20

	and,COND(<>)	%r19, %r20, %r0

	b,n	intr_restore	/* skip past if we've nothing to do */
@@ -1810,7 +1810,7 @@ syscall_check_resched: 
	.import do_signal,code

syscall_check_sig:

	LDREG	TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19

	ldi	(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME), %r26

	ldi	(_TIF_USER_WORK_MASK & ~_TIF_NEED_RESCHED), %r26

	and,COND(<>)	%r19, %r26, %r0

	b,n	syscall_restore	/* skip past if we've nothing to do */

arch/parisc/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ pcxl_free_range(unsigned long vaddr, size_t size) 
	dump_resmap();

}



static int proc_pcxl_dma_show(struct seq_file *m, void *v)

static int __maybe_unused proc_pcxl_dma_show(struct seq_file *m, void *v)

{

#if 0

	u_long i = 0;

arch/parisc/kernel/processor.c

+2 −3
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ static int __init processor_probe(struct parisc_device *dev) 
	if (cpuid)

		memset(p, 0, sizeof(struct cpuinfo_parisc));



	p->loops_per_jiffy = loops_per_jiffy;

	p->dev = dev;		/* Save IODC data in case we need it */

	p->hpa = dev->hpa.start;	/* save CPU hpa */

	p->cpuid = cpuid;	/* save CPU id */
@@ -434,8 +433,8 @@ show_cpuinfo (struct seq_file *m, void *v) 
		show_cache_info(m);



		seq_printf(m, "bogomips\t: %lu.%02lu\n",

			     cpuinfo->loops_per_jiffy / (500000 / HZ),

			     (cpuinfo->loops_per_jiffy / (5000 / HZ)) % 100);

			     loops_per_jiffy / (500000 / HZ),

			     loops_per_jiffy / (5000 / HZ) % 100);



		seq_printf(m, "software id\t: %ld\n\n",

				boot_cpu_data.pdc.model.sw_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE