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

Commit 3eb05676 authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds
Browse files

time: fix typo in comments 



Fix typo in comments.

BTW: I have to fix coding style in arch/ia64/kernel/time.c also, otherwise
checkpatch.pl will be complaining.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cf4fc6cb

arch/ia64/kernel/time.c

+7 −7
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static struct clocksource clocksource_itc = { 
	.rating         = 350,

	.read           = itc_get_cycles,

	.mask           = CLOCKSOURCE_MASK(64),

        .mult           = 0, /*to be caluclated*/

	.mult           = 0, /*to be calculated*/

	.shift          = 16,

	.flags          = CLOCK_SOURCE_IS_CONTINUOUS,

};

arch/x86/kernel/time_64.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ unsigned long __init native_calculate_cpu_khz(void) 
		reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i);

	}

	local_irq_save(flags);

	/* start meauring cycles, incrementing from 0 */

	/* start measuring cycles, incrementing from 0 */

	wrmsrl(MSR_K7_PERFCTR0 + i, 0);

	wrmsrl(MSR_K7_EVNTSEL0 + i, 1 << 22 | 3 << 16 | 0x76);

	rdtscl(tsc_start);

include/linux/hrtimer.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ enum hrtimer_cb_mode { 
 * as otherwise the timer could be removed before the softirq code finishes the

 * the handling of the timer.

 *

 * The HRTIMER_STATE_ENQUEUE bit is always or'ed to the current state to

 * The HRTIMER_STATE_ENQUEUED bit is always or'ed to the current state to

 * preserve the HRTIMER_STATE_CALLBACK bit in the above scenario.

 *

 * All state transitions are protected by cpu_base->lock.

include/linux/jiffies.h

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
/* LATCH is used in the interval timer and ftape setup. */

#define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */



/* Suppose we want to devide two numbers NOM and DEN: NOM/DEN, the we can

/* Suppose we want to devide two numbers NOM and DEN: NOM/DEN, then we can

 * improve accuracy by shifting LSH bits, hence calculating:

 *     (NOM << LSH) / DEN

 * This however means trouble for large NOM, because (NOM << LSH) may no
@@ -160,7 +160,7 @@ extern unsigned long preset_lpj; 
 * We want to do realistic conversions of time so we need to use the same

 * values the update wall clock code uses as the jiffies size.  This value

 * is: TICK_NSEC (which is defined in timex.h).  This

 * is a constant and is in nanoseconds.  We will used scaled math

 * is a constant and is in nanoseconds.  We will use scaled math

 * with a set of scales defined here as SEC_JIFFIE_SC,  USEC_JIFFIE_SC and

 * NSEC_JIFFIE_SC.  Note that these defines contain nothing but

 * constants and so are computed at compile time.  SHIFT_HZ (computed in
@@ -204,7 +204,7 @@ extern unsigned long preset_lpj; 
 * operator if the result is a long long AND at least one of the

 * operands is cast to long long (usually just prior to the "*" so as

 * not to confuse it into thinking it really has a 64-bit operand,

 * which, buy the way, it can do, but it take more code and at least 2

 * which, buy the way, it can do, but it takes more code and at least 2

 * mpys).



 * We also need to be aware that one second in nanoseconds is only a

kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ EXPORT_SYMBOL(jiffies_to_usecs); 
 *

 * This function should be only used for timestamps returned by

 * current_kernel_time() or CURRENT_TIME, not with do_gettimeofday() because

 * it doesn't handle the better resolution of the later.

 * it doesn't handle the better resolution of the latter.

 */

struct timespec timespec_trunc(struct timespec t, unsigned gran)

{
@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(getnstimeofday); 
 * This algorithm was first published by Gauss (I think).

 *

 * WARNING: this function will overflow on 2106-02-07 06:28:16 on

 * machines were long is 32-bit! (However, as time_t is signed, we

 * machines where long is 32-bit! (However, as time_t is signed, we

 * will already get problems at other places on 2038-01-19 03:14:08)

 */

unsigned long