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

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

posix-timers: Cleanup namespace 



Rename register_posix_clock() to posix_timers_register_clock(). That's
what the function really does. As a side effect this cleans up the
posix_clock namespace for the upcoming dynamic posix_clock
infrastructure.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarRichard Cochran <richard.cochran@omicron.at>
Cc: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <alpine.LFD.2.00.1102021222240.31804@localhost6.localdomain6>
parent 81e294cb

drivers/char/mmtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static int __init mmtimer_init(void) 
	}



	sgi_clock_period = NSEC_PER_SEC / sn_rtc_cycles_per_second;

	register_posix_clock(CLOCK_SGI_CYCLE, &sgi_clock);

	posix_timers_register_clock(CLOCK_SGI_CYCLE, &sgi_clock);



	printk(KERN_INFO "%s: v%s, %ld MHz\n", MMTIMER_DESC, MMTIMER_VERSION,

	       sn_rtc_cycles_per_second/(unsigned long)1E6);

include/linux/posix-timers.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ struct k_clock { 


extern struct k_clock clock_posix_cpu;



void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock);

void posix_timers_register_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);

kernel/posix-cpu-timers.c

+2 −2
Original line number Diff line number Diff line
@@ -1618,8 +1618,8 @@ static __init int init_posix_cpu_timers(void) 
	};

	struct timespec ts;



	register_posix_clock(CLOCK_PROCESS_CPUTIME_ID, &process);

	register_posix_clock(CLOCK_THREAD_CPUTIME_ID, &thread);

	posix_timers_register_clock(CLOCK_PROCESS_CPUTIME_ID, &process);

	posix_timers_register_clock(CLOCK_THREAD_CPUTIME_ID, &thread);



	cputime_to_timespec(cputime_one_jiffy, &ts);

	onecputick = ts.tv_nsec;

kernel/posix-timers.c

+8 −7
Original line number Diff line number Diff line
@@ -253,11 +253,11 @@ static __init int init_posix_timers(void) 
		.clock_get	= posix_get_monotonic_coarse,

	};



	register_posix_clock(CLOCK_REALTIME, &clock_realtime);

	register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);

	register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);

	register_posix_clock(CLOCK_REALTIME_COARSE, &clock_realtime_coarse);

	register_posix_clock(CLOCK_MONOTONIC_COARSE, &clock_monotonic_coarse);

	posix_timers_register_clock(CLOCK_REALTIME, &clock_realtime);

	posix_timers_register_clock(CLOCK_MONOTONIC, &clock_monotonic);

	posix_timers_register_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);

	posix_timers_register_clock(CLOCK_REALTIME_COARSE, &clock_realtime_coarse);

	posix_timers_register_clock(CLOCK_MONOTONIC_COARSE, &clock_monotonic_coarse);



	posix_timers_cache = kmem_cache_create("posix_timers_cache",

					sizeof (struct k_itimer), 0, SLAB_PANIC,
@@ -433,7 +433,8 @@ static struct pid *good_sigevent(sigevent_t * event) 
	return task_pid(rtn);

}



void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock)

void posix_timers_register_clock(const clockid_t clock_id,

				 struct k_clock *new_clock)

{

	if ((unsigned) clock_id >= MAX_CLOCKS) {

		printk(KERN_WARNING "POSIX clock register failed for clock_id %d\n",
@@ -454,7 +455,7 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock) 


	posix_clocks[clock_id] = *new_clock;

}

EXPORT_SYMBOL_GPL(register_posix_clock);

EXPORT_SYMBOL_GPL(posix_timers_register_clock);



static struct k_itimer * alloc_posix_timer(void)

{