Merge commit 'linus/master' into merge-linus

[linux-2.6-omap-h63xx.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 0bc8fa3c2288110b49fad4e9eaab2326f52c69f7..fc71f99fb469a22da88b08263e2609409566173b 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1739,6 +1739,16 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
                case PR_SET_TSC:
                        error = SET_TSC_CTL(arg2);
                        break;
+               case PR_GET_TIMERSLACK:
+                       error = current->timer_slack_ns;
+                       break;
+               case PR_SET_TIMERSLACK:
+                       if (arg2 <= 0)
+                               current->timer_slack_ns =
+                                       current->default_timer_slack_ns;
+                       else
+                               current->timer_slack_ns = arg2;
+                       break;
                default:
                        error = -EINVAL;
                        break;