Commit fa2e5c07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc 

Pull exec domain removal from Richard Weinberger:
 "This series removes execution domain support from Linux.

  The idea behind exec domains was to support different ABIs.  The
  feature was never complete nor stable.  Let's rip it out and make the
  kernel signal handling code less complicated"

* 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc: (27 commits)
  arm64: Removed unused variable
  sparc: Fix execution domain removal
  Remove rest of exec domains.
  arch: Remove exec_domain from remaining archs
  arc: Remove signal translation and exec_domain
  xtensa: Remove signal translation and exec_domain
  xtensa: Autogenerate offsets in struct thread_info
  x86: Remove signal translation and exec_domain
  unicore32: Remove signal translation and exec_domain
  um: Remove signal translation and exec_domain
  tile: Remove signal translation and exec_domain
  sparc: Remove signal translation and exec_domain
  sh: Remove signal translation and exec_domain
  s390: Remove signal translation and exec_domain
  mn10300: Remove signal translation and exec_domain
  microblaze: Remove signal translation and exec_domain
  m68k: Remove signal translation and exec_domain
  m32r: Remove signal translation and exec_domain
  m32r: Autogenerate offsets in struct thread_info
  frv: Remove signal translation and exec_domain
  ...
parents e44740c1 97b2f0dc

arch/alpha/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ struct thread_info { 
	unsigned int		flags;		/* low level flags */

	unsigned int		ieee_state;	/* see fpu.h */



	struct exec_domain	*exec_domain;	/* execution domain */

	mm_segment_t		addr_limit;	/* thread address space */

	unsigned		cpu;		/* current CPU */

	int			preempt_count; /* 0 => preemptable, <0 => BUG */
@@ -35,7 +34,6 @@ struct thread_info { 
#define INIT_THREAD_INFO(tsk)			\

{						\

	.task		= &tsk,			\

	.exec_domain	= &default_exec_domain,	\

	.addr_limit	= KERNEL_DS,		\

	.preempt_count	= INIT_PREEMPT_COUNT,	\

}

arch/arc/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ struct thread_info { 
	int preempt_count;		/* 0 => preemptable, <0 => BUG */

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

	mm_segment_t addr_limit;	/* thread address space */

	struct exec_domain *exec_domain;/* execution domain */

	__u32 cpu;			/* current CPU */

	unsigned long thr_ptr;		/* TLS ptr */

};
@@ -56,7 +55,6 @@ struct thread_info { 
#define INIT_THREAD_INFO(tsk)			\

{						\

	.task       = &tsk,			\

	.exec_domain    = &default_exec_domain,	\

	.flags      = 0,			\

	.cpu        = 0,			\

	.preempt_count  = INIT_PREEMPT_COUNT,	\

arch/arc/kernel/signal.c

+1 −13
Original line number Diff line number Diff line
@@ -171,18 +171,6 @@ static inline void __user *get_sigframe(struct ksignal *ksig, 
	return frame;

}



/*

 * translate the signal

 */

static inline int map_sig(int sig)

{

	struct thread_info *thread = current_thread_info();

	if (thread->exec_domain && thread->exec_domain->signal_invmap

	    && sig < 32)

		sig = thread->exec_domain->signal_invmap[sig];

	return sig;

}



static int

setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)

{
@@ -231,7 +219,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs) 
		return err;



	/* #1 arg to the user Signal handler */

	regs->r0 = map_sig(ksig->sig);

	regs->r0 = ksig->sig;



	/* setup PC of user space signal handler */

	regs->ret = (unsigned long)ksig->ka.sa.sa_handler;

arch/arm/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -2133,16 +2133,6 @@ menu "Userspace binary formats" 


source "fs/Kconfig.binfmt"



config ARTHUR

	tristate "RISC OS personality"

	depends on !AEABI

	help

	  Say Y here to include the kernel code necessary if you want to run

	  Acorn RISC OS/Arthur binaries under Linux. This code is still very

	  experimental; if this sounds frightening, say N and sleep in peace.

	  You can also say M here to compile this support as a module (which

	  will be called arthur).



endmenu



menu "Power management options"

arch/arm/configs/badge4_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 
CONFIG_FPE_NWFPE=y

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

CONFIG_ARTHUR=m

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE