summaryrefslogtreecommitdiffstats
path: root/kernel/time.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-06-30 00:21:34 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-06-30 00:21:34 +0000
commit3917ac5846dd0f9ad1238166f90caab9912052e6 (patch)
tree1c298935def4f29edb39192365a65d73de999155 /kernel/time.c
parentaf2f803c8b2d469fe38e4a7ce952658dfcb6681a (diff)
o Merge with Linux 2.1.100.
o Cleanup the machine dependencies of floppy and rtc. The driver for the Dallas thingy in the Indy is still missing. o Handle allocation of zero'd pages correct for R4000SC / R4400SC. o Page colouring shit to match the virtual and physical colour of all mapped pages. This tends to produce extreme fragmentation problems, so it's deactivated for now. Users of R4000SC / R4400SC may re-enable the code in arch/mips/mm/init.c by removing the definition of CONF_GIVE_A_SHIT_ABOUT_COLOURS. Should get them somewhat further - but don't shake to hard ... o Fixed ptrace(2)-ing of syscalls, strace is now working again. o Fix the interrupt forwarding from the keyboard driver to the psaux driver, PS/2 mice are now working on the Indy. The fix is somewhat broken as it prevents generic kernels for Indy and machines which handle things different. o Things I can't remember.
Diffstat (limited to 'kernel/time.c')
-rw-r--r--kernel/time.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time.c b/kernel/time.c
index e16a7a150..ff3a5d684 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -87,7 +87,7 @@ asmlinkage int sys_stime(int * tptr)
{
int value;
- if (!suser())
+ if (!capable(CAP_SYS_TIME))
return -EPERM;
if (get_user(value, tptr))
return -EFAULT;
@@ -156,7 +156,7 @@ int do_sys_settimeofday(struct timeval *tv, struct timezone *tz)
{
static int firsttime = 1;
- if (!suser())
+ if (!capable(CAP_SYS_TIME))
return -EPERM;
if (tz) {
@@ -221,7 +221,7 @@ int do_adjtimex(struct timex *txc)
long ltemp, mtemp, save_adjust;
/* In order to modify anything, you gotta be super-user! */
- if (txc->modes && !suser())
+ if (txc->modes && !capable(CAP_SYS_TIME))
return -EPERM;
/* Now we validate the data before disabling interrupts */