mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branches 'no-rebases', 'arch-avr32', 'arch-blackfin', 'arch-cris', 'arch-h8300', 'arch-m32r', 'arch-mn10300', 'arch-score', 'arch-sh' and 'arch-powerpc' into for-next
This commit is contained in:
parent
d2125043ae
a2b6dfaef0
5fd0b580a9
999121a10c
1703a219f7
71915d21e5
8eae10e86c
ddf23e87a8
1ffbed7220
80b249b71e
ab75819d39
commit
f4091322d7
165 changed files with 982 additions and 2781 deletions
|
|
@ -16,6 +16,7 @@ config M68K
|
|||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
|
||||
select GENERIC_KERNEL_THREAD
|
||||
select GENERIC_KERNEL_EXECVE
|
||||
select HAVE_MOD_ARCH_SPECIFIC
|
||||
select MODULES_USE_ELF_REL
|
||||
select MODULES_USE_ELF_RELA
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#define __ARCH_WANT_SYS_RT_SIGACTION
|
||||
#define __ARCH_WANT_SYS_RT_SIGSUSPEND
|
||||
#define __ARCH_WANT_SYS_EXECVE
|
||||
#define __ARCH_WANT_KERNEL_EXECVE
|
||||
|
||||
/*
|
||||
* "Conditional" syscalls
|
||||
|
|
|
|||
|
|
@ -115,16 +115,9 @@ ENTRY(ret_from_kernel_thread)
|
|||
| a3 contains the kernel thread payload, d7 - its argument
|
||||
movel %d1,%sp@-
|
||||
jsr schedule_tail
|
||||
GET_CURRENT(%d0)
|
||||
movel %d7,(%sp)
|
||||
jsr %a3@
|
||||
addql #4,%sp
|
||||
movel %d0,(%sp)
|
||||
jra sys_exit
|
||||
|
||||
ENTRY(ret_from_kernel_execve)
|
||||
movel 4(%sp), %sp
|
||||
GET_CURRENT(%d0)
|
||||
jra ret_from_exception
|
||||
|
||||
#if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU)
|
||||
|
|
|
|||
Loading…
Reference in a new issue