summaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
commit8624512aa908741ba2795200133eae0d7f4557ea (patch)
treed5d3036fccf2604f4c98dedc11e8adb929d6b52e /kernel/sys.c
parent7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff)
Merge with 2.3.48.
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index e3f7c5e2b..550df4db9 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -226,8 +226,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, int cmd, void * arg)
default:
unlock_kernel();
return -EINVAL;
- break;
- };
+ }
unlock_kernel();
return 0;
}
@@ -1049,6 +1048,22 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
}
current->dumpable = arg2;
break;
+ case PR_SET_UNALIGN:
+#ifdef SET_UNALIGN_CTL
+ error = SET_UNALIGN_CTL(current, arg2);
+#else
+ error = -EINVAL;
+#endif
+ break;
+
+ case PR_GET_UNALIGN:
+#ifdef GET_UNALIGN_CTL
+ error = GET_UNALIGN_CTL(current, arg2);
+#else
+ error = -EINVAL;
+#endif
+ break;
+
default:
error = -EINVAL;
break;