Commit 987a0874 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org:/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc updates from David Miller:
 "Just some more random bits from Al, including a conversion over to
  generic extables"

* git://git.kernel.org:/pub/scm/linux/kernel/git/davem/sparc:
  sparc32: take ->thread.flags out
  sparc32: get rid of fake_swapper_regs
  sparc64: get rid of fake_swapper_regs
  sparc32: switch to generic extables
  sparc32: switch copy_user.S away from range exception table entries
  sparc32: get rid of range exception table entries in checksum_32.S
  sparc32: switch __bzero() away from range exception table entries
  sparc32: kill lookup_fault()
  sparc32: don't bother with lookup_fault() in __bzero()
parents 144c79ef cf64c2a9

arch/sparc/include/asm/elf_64.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 


#include <asm/ptrace.h>

#include <asm/processor.h>

#include <asm/extable_64.h>

#include <asm/spitfire.h>

#include <asm/adi.h>

arch/sparc/include/asm/extable_64.h→arch/sparc/include/asm/extable.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_EXTABLE64_H

#define __ASM_EXTABLE64_H

#ifndef __ASM_EXTABLE_H

#define __ASM_EXTABLE_H

/*

 * The exception table consists of pairs of addresses: the first is the

 * address of an instruction that is allowed to fault, and the second is

arch/sparc/include/asm/processor_32.h

+1 −5
Original line number Diff line number Diff line
@@ -50,16 +50,12 @@ struct thread_struct { 
	unsigned long   fsr;

	unsigned long   fpqdepth;

	struct fpq	fpqueue[16];

	unsigned long flags;

	mm_segment_t current_ds;

};



#define SPARC_FLAG_KTHREAD      0x1    /* task is a kernel thread */

#define SPARC_FLAG_UNALIGNED    0x2    /* is allowed to do unaligned accesses */



#define INIT_THREAD  { \

	.flags = SPARC_FLAG_KTHREAD, \

	.current_ds = KERNEL_DS, \

	.kregs = (struct pt_regs *)(init_stack+THREAD_SIZE)-1 \

}



/* Do necessary setup to start up a newly executed thread. */

arch/sparc/include/asm/thread_info_64.h

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ struct thread_info { 
	.task		=	&tsk,			\

	.current_ds	=	ASI_P,			\

	.preempt_count	=	INIT_PREEMPT_COUNT,	\

	.kregs		=	(struct pt_regs *)(init_stack+THREAD_SIZE)-1 \

}



/* how to get the thread information struct from C */

arch/sparc/include/asm/uaccess.h

+3 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef ___ASM_SPARC_UACCESS_H

#define ___ASM_SPARC_UACCESS_H



#include <asm/extable.h>



#if defined(__sparc__) && defined(__arch64__)

#include <asm/uaccess_64.h>

#else