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

Commit 94b237b6 authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'arch-tile' into no-rebases

parents 2482f844 008f1794

arch/tile/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ config TILE 
	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select GENERIC_CLOCKEVENTS

	select MODULES_USE_ELF_RELA

	select GENERIC_KERNEL_THREAD

	select GENERIC_KERNEL_EXECVE



# FIXME: investigate whether we need/want these options.

#	select HAVE_IOREMAP_PROT

arch/tile/include/asm/compat.h

+3 −12
Original line number Diff line number Diff line
@@ -275,18 +275,14 @@ extern int compat_setup_rt_frame(int sig, struct k_sigaction *ka, 
struct compat_sigaction;

struct compat_siginfo;

struct compat_sigaltstack;

long compat_sys_execve(const char __user *path,

		       compat_uptr_t __user *argv,

		       compat_uptr_t __user *envp, struct pt_regs *);

long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act,

			     struct compat_sigaction __user *oact,

			     size_t sigsetsize);

long compat_sys_rt_sigqueueinfo(int pid, int sig,

				struct compat_siginfo __user *uinfo);

long compat_sys_rt_sigreturn(struct pt_regs *);

long compat_sys_rt_sigreturn(void);

long compat_sys_sigaltstack(const struct compat_sigaltstack __user *uss_ptr,

			    struct compat_sigaltstack __user *uoss_ptr,

			    struct pt_regs *);

			    struct compat_sigaltstack __user *uoss_ptr);

long compat_sys_truncate64(char __user *filename, u32 dummy, u32 low, u32 high);

long compat_sys_ftruncate64(unsigned int fd, u32 dummy, u32 low, u32 high);

long compat_sys_pread64(unsigned int fd, char __user *ubuf, size_t count,
@@ -303,12 +299,7 @@ long compat_sys_fallocate(int fd, int mode, 
long compat_sys_sched_rr_get_interval(compat_pid_t pid,

				      struct compat_timespec __user *interval);



/* These are the intvec_64.S trampolines. */

long _compat_sys_execve(const char __user *path,

			const compat_uptr_t __user *argv,

			const compat_uptr_t __user *envp);

long _compat_sys_sigaltstack(const struct compat_sigaltstack __user *uss_ptr,

			    struct compat_sigaltstack __user *uoss_ptr);

/* Assembly trampoline to avoid clobbering r0. */

long _compat_sys_rt_sigreturn(void);



#endif /* _ASM_TILE_COMPAT_H */

arch/tile/include/asm/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, 
#define compat_start_thread(regs, ip, usp) do { \

		regs->pc = ptr_to_compat_reg((void *)(ip)); \

		regs->sp = ptr_to_compat_reg((void *)(usp)); \

		single_step_execve();	\

	} while (0)



/*

arch/tile/include/asm/processor.h

+4 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ static inline void start_thread(struct pt_regs *regs, 
{

	regs->pc = pc;

	regs->sp = usp;

	single_step_execve();

}



/* Free all resources held by a thread. */
@@ -239,6 +240,9 @@ unsigned long get_wchan(struct task_struct *p); 
#define KSTK_TOP(task)	(task_ksp0(task) - STACK_TOP_DELTA)

#define task_pt_regs(task) \

  ((struct pt_regs *)(task_ksp0(task) - KSTK_PTREGS_GAP) - 1)

#define current_pt_regs()                                   \

  ((struct pt_regs *)((stack_pointer | (THREAD_SIZE - 1)) - \

                      (KSTK_PTREGS_GAP - 1)) - 1)

#define task_sp(task)	(task_pt_regs(task)->sp)

#define task_pc(task)	(task_pt_regs(task)->pc)

/* Aliases for pc and sp (used in fs/proc/array.c) */

arch/tile/include/asm/switch_to.h

+4 −1
Original line number Diff line number Diff line
@@ -68,7 +68,10 @@ extern unsigned long get_switch_to_pc(void); 
/* Support function for forking a new task. */

void ret_from_fork(void);



/* Called from ret_from_fork() when a new process starts up. */

/* Support function for forking a new kernel thread. */

void ret_from_kernel_thread(void *fn, void *arg);



/* Called from ret_from_xxx() when a new process starts up. */

struct task_struct *sim_notify_fork(struct task_struct *prev);



#endif /* !__ASSEMBLY__ */