Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc2c8ea4 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

posix-timers: Make posix-cpu-timers functions static 



All functions are accessed via clock_posix_cpu now. So make them static.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Tested-by: default avatarRichard Cochran <richard.cochran@omicron.at>
LKML-Reference: <20110201134419.389755466@linutronix.de>
parent 0aa3975f

include/linux/posix-timers.h

+0 −12
Original line number Diff line number Diff line
@@ -91,18 +91,6 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock); 
/* function to call to trigger timer event */

int posix_timer_event(struct k_itimer *timr, int si_private);



int posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *ts);

int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *ts);

int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *ts);

int posix_cpu_timer_create(struct k_itimer *timer);

int posix_cpu_nsleep(const clockid_t which_clock, int flags,

		     struct timespec *rqtp, struct timespec __user *rmtp);

long posix_cpu_nsleep_restart(struct restart_block *restart_block);

int posix_cpu_timer_set(struct k_itimer *timer, int flags,

			struct itimerspec *new, struct itimerspec *old);

int posix_cpu_timer_del(struct k_itimer *timer);

void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp);



void posix_cpu_timer_schedule(struct k_itimer *timer);



void run_posix_cpu_timers(struct task_struct *task);

kernel/posix-cpu-timers.c

+15 −12
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ static inline cputime_t virt_ticks(struct task_struct *p) 
	return p->utime;

}



int posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp)

static int

posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp)

{

	int error = check_clock(which_clock);

	if (!error) {
@@ -194,7 +195,8 @@ int posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp) 
	return error;

}



int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *tp)

static int

posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *tp)

{

	/*

	 * You can never reset a CPU clock, but we check for other errors
@@ -317,7 +319,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock, 
}





int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp)

static int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp)

{

	const pid_t pid = CPUCLOCK_PID(which_clock);

	int error = -EINVAL;
@@ -379,7 +381,7 @@ int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp) 
 * This is called from sys_timer_create() and do_cpu_nanosleep() with the

 * new timer already all-zeros initialized.

 */

int posix_cpu_timer_create(struct k_itimer *new_timer)

static int posix_cpu_timer_create(struct k_itimer *new_timer)

{

	int ret = 0;

	const pid_t pid = CPUCLOCK_PID(new_timer->it_clock);
@@ -425,7 +427,7 @@ int posix_cpu_timer_create(struct k_itimer *new_timer) 
 * If we return TIMER_RETRY, it's necessary to release the timer's lock

 * and try again.  (This happens when the timer is in the middle of firing.)

 */

int posix_cpu_timer_del(struct k_itimer *timer)

static int posix_cpu_timer_del(struct k_itimer *timer)

{

	struct task_struct *p = timer->it.cpu.task;

	int ret = 0;
@@ -665,7 +667,7 @@ static int cpu_timer_sample_group(const clockid_t which_clock, 
 * If we return TIMER_RETRY, it's necessary to release the timer's lock

 * and try again.  (This happens when the timer is in the middle of firing.)

 */

int posix_cpu_timer_set(struct k_itimer *timer, int flags,

static int posix_cpu_timer_set(struct k_itimer *timer, int flags,

			       struct itimerspec *new, struct itimerspec *old)

{

	struct task_struct *p = timer->it.cpu.task;
@@ -820,7 +822,7 @@ int posix_cpu_timer_set(struct k_itimer *timer, int flags, 
	return ret;

}



void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp)

static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp)

{

	union cpu_time_count now;

	struct task_struct *p = timer->it.cpu.task;
@@ -1481,7 +1483,9 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, 
	return error;

}



int posix_cpu_nsleep(const clockid_t which_clock, int flags,

static long posix_cpu_nsleep_restart(struct restart_block *restart_block);



static int posix_cpu_nsleep(const clockid_t which_clock, int flags,

			    struct timespec *rqtp, struct timespec __user *rmtp)

{

	struct restart_block *restart_block =
@@ -1517,7 +1521,7 @@ int posix_cpu_nsleep(const clockid_t which_clock, int flags, 
	return error;

}



long posix_cpu_nsleep_restart(struct restart_block *restart_block)

static long posix_cpu_nsleep_restart(struct restart_block *restart_block)

{

	clockid_t which_clock = restart_block->nanosleep.index;

	struct timespec t;
@@ -1542,7 +1546,6 @@ long posix_cpu_nsleep_restart(struct restart_block *restart_block) 


}





#define PROCESS_CLOCK	MAKE_PROCESS_CPUCLOCK(0, CPUCLOCK_SCHED)

#define THREAD_CLOCK	MAKE_THREAD_CPUCLOCK(0, CPUCLOCK_SCHED)