diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 15:10:58 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 15:10:58 +0800 |
| commit | 8f71fb87e288c5f374ea0e0ddac18707b6649f72 (patch) | |
| tree | dd77032ddcfcfe995436031281eb008a471cfc30 /kernel/timer.c | |
| parent | d9875690d9b89a866022ff49e3fcea892345ad92 (diff) | |
| parent | f8135a74df53ba7010a162dddd112b73ee5652e3 (diff) | |
| download | cachepc-linux-8f71fb87e288c5f374ea0e0ddac18707b6649f72.tar.gz cachepc-linux-8f71fb87e288c5f374ea0e0ddac18707b6649f72.zip | |
Merge tag 'imx-dt-3.7' into imx/dt-for-3.7-2
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index a61c09374eba..8c5e7b908c68 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1407,13 +1407,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 * @@ -1469,8 +1462,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); |