2.6.24-git15

 kernel

diff --git a/kernel/sys.c b/kernel/sys.c
index d1fe71e..53de35f 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -315,7 +315,7 @@ static void kernel_kexec(void)
 #endif
 }
 
-void kernel_shutdown_prepare(enum system_states state)
+static void kernel_shutdown_prepare(enum system_states state)
 {
    blocking_notifier_call_chain(&reboot_notifier_list,
       (state == SYSTEM_HALT)?SYS_HALT:SYS_POWER_OFF, NULL);
@@ -1637,7 +1637,7 @@ asmlinkage long sys_umask(int mask)
    mask = xchg(¤t->fs->umask, mask & S_IRWXUGO);
    return mask;
 }
-    
+
 asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
            unsigned long arg4, unsigned long arg5)
 {
@@ -1742,6 +1742,17 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
          error = prctl_set_seccomp(arg2);
          break;
 
+      case PR_CAPBSET_READ:
+         if (!cap_valid(arg2))
+            return -EINVAL;
+         return !!cap_raised(current->cap_bset, arg2);
+      case PR_CAPBSET_DROP:
+#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
+         return cap_prctl_drop(arg2);
+#else
+         return -EINVAL;
+#endif
+
       default:
          error = -EINVAL;
          break;