mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
Merge branch 'fortglx/3.7/time' of git://git.linaro.org/people/jstultz/linux into timers/core
This commit is contained in:
commit
db8c246937
8069 changed files with 470633 additions and 200995 deletions
|
|
@ -1393,13 +1393,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, seconds)
|
|||
|
||||
#endif
|
||||
|
||||
#ifndef __alpha__
|
||||
|
||||
/*
|
||||
* The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
|
||||
* should be moved into arch/i386 instead?
|
||||
*/
|
||||
|
||||
/**
|
||||
* sys_getpid - return the thread group id of the current process
|
||||
*
|
||||
|
|
@ -1455,8 +1448,6 @@ SYSCALL_DEFINE0(getegid)
|
|||
return from_kgid_munged(current_user_ns(), current_egid());
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static void process_timeout(unsigned long __data)
|
||||
{
|
||||
wake_up_process((struct task_struct *)__data);
|
||||
|
|
|
|||
Loading…
Reference in a new issue