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

Commit 976fb3f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull parisc updates from Helge Deller:
 "This patchset adds stack usage debug info for parisc and metag (on
  both the stack grows upwards), switches to the new generic realative
  extable search and sort routines, drops the long time ago removed
  syscalls alloc_hugepages and free_hugepages and wires up the new
  preadv2 and pwritev2 syscalls"

* 'parisc-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Wire up preadv2 and pwritev2 syscalls
  parisc: Use generic extable search and sort routines
  parisc: Panic immediately when panic_on_oops
  parisc,metag: Implement CONFIG_DEBUG_STACK_USAGE option
  parisc: Drop alloc_hugepages and free_hugepages syscalls
parents 9d854607 119a0a3c

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config PARISC 
	select RTC_DRV_GENERIC

	select INIT_ALL_POSSIBLE

	select BUG

	select BUILDTIME_EXTABLE_SORT

	select HAVE_PERF_EVENTS

	select GENERIC_ATOMIC64 if !64BIT

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

arch/parisc/include/asm/assembly.h

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ 
	 */

#define ASM_EXCEPTIONTABLE_ENTRY(fault_addr, except_addr)	\

	.section __ex_table,"aw"			!	\

	ASM_ULONG_INSN	fault_addr, except_addr		!	\

	.word (fault_addr - .), (except_addr - .)	!	\

	.previous

arch/parisc/include/asm/uaccess.h

+4 −3
Original line number Diff line number Diff line
@@ -60,14 +60,15 @@ static inline long access_ok(int type, const void __user * addr, 
 * use a 32bit (unsigned int) address here.

 */



#define ARCH_HAS_RELATIVE_EXTABLE

struct exception_table_entry {

	unsigned long insn;	/* address of insn that is allowed to fault. */

	unsigned long fixup;	/* fixup routine */

	int insn;	/* relative address of insn that is allowed to fault. */

	int fixup;	/* relative address of fixup routine */

};



#define ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr )\

	".section __ex_table,\"aw\"\n"			   \

	ASM_WORD_INSN #fault_addr ", " #except_addr "\n\t" \

	".word (" #fault_addr " - .), (" #except_addr " - .)\n\t" \

	".previous\n"



/*

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

+5 −3
Original line number Diff line number Diff line
@@ -235,8 +235,8 @@ 
#define __NR_io_getevents       (__NR_Linux + 217)

#define __NR_io_submit          (__NR_Linux + 218)

#define __NR_io_cancel          (__NR_Linux + 219)

#define __NR_alloc_hugepages    (__NR_Linux + 220)

#define __NR_free_hugepages     (__NR_Linux + 221)

#define __NR_alloc_hugepages    (__NR_Linux + 220) /* not used */

#define __NR_free_hugepages     (__NR_Linux + 221) /* not used */

#define __NR_exit_group         (__NR_Linux + 222)

#define __NR_lookup_dcookie     (__NR_Linux + 223)

#define __NR_epoll_create       (__NR_Linux + 224)
@@ -362,8 +362,10 @@ 
#define __NR_userfaultfd	(__NR_Linux + 344)

#define __NR_mlock2		(__NR_Linux + 345)

#define __NR_copy_file_range	(__NR_Linux + 346)

#define __NR_preadv2		(__NR_Linux + 347)

#define __NR_pwritev2		(__NR_Linux + 348)



#define __NR_Linux_syscalls	(__NR_copy_file_range + 1)

#define __NR_Linux_syscalls	(__NR_pwritev2 + 1)





#define __IGNORE_select		/* newselect */

arch/parisc/kernel/sys_parisc.c

+0 −10
Original line number Diff line number Diff line
@@ -368,16 +368,6 @@ asmlinkage long parisc_fallocate(int fd, int mode, u32 offhi, u32 offlo, 
                             ((u64)lenhi << 32) | lenlo);

}



asmlinkage unsigned long sys_alloc_hugepages(int key, unsigned long addr, unsigned long len, int prot, int flag)

{

	return -ENOMEM;

}



asmlinkage int sys_free_hugepages(unsigned long addr)

{

	return -EINVAL;

}



long parisc_personality(unsigned long personality)

{

	long err;