GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 21:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

time: Whitespace cleanups per Ingo%27s requests

Browse source 
Ingo noted a number of places where there is inconsistent
use of whitespace. This patch tries to address the main
culprits.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Link: http://lkml.kernel.org/r/1342156917-25092-3-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
John Stultz 2012-07-13 01:21:51 -04:00 • committed by Thomas Gleixner
parent e8b9dd7e24
commit 42e71e81f5
1 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
kernel/time/timekeeping.c
View file

@ -24,32 +24,31 @@
/* Structure holding internal timekeeping values. */ /* Structure holding internal timekeeping values. */
struct timekeeper { struct timekeeper {
/* Current clocksource used for timekeeping. */ /* Current clocksource used for timekeeping. */
struct clocksource *clock; struct clocksource *clock;
/* NTP adjusted clock multiplier */ /* NTP adjusted clock multiplier */
u32 mult; u32 mult;
/* The shift value of the current clocksource. */ /* The shift value of the current clocksource. */
int shift; int shift;
/* Number of clock cycles in one NTP interval. */ /* Number of clock cycles in one NTP interval. */
cycle_t cycle_interval; cycle_t cycle_interval;
/* Number of clock shifted nano seconds in one NTP interval. */ /* Number of clock shifted nano seconds in one NTP interval. */
u64 xtime_interval; u64 xtime_interval;
/* shifted nano seconds left over when rounding cycle_interval */ /* shifted nano seconds left over when rounding cycle_interval */
s64 xtime_remainder; s64 xtime_remainder;
/* Raw nano seconds accumulated per NTP interval. */ /* Raw nano seconds accumulated per NTP interval. */
u32 raw_interval; u32 raw_interval;
/* Clock shifted nano seconds remainder not stored in xtime.tv_nsec. */ /* Clock shifted nano seconds remainder not stored in xtime.tv_nsec. */
u64 xtime_nsec; u64 xtime_nsec;
/* Difference between accumulated time and NTP time in ntp /* Difference between accumulated time and NTP time in ntp
* shifted nano seconds. */ * shifted nano seconds. */
s64 ntp_error; s64 ntp_error;
/* Shift conversion between clock shifted nano seconds and /* Shift conversion between clock shifted nano seconds and
* ntp shifted nano seconds. */ * ntp shifted nano seconds. */
int ntp_error_shift; int ntp_error_shift;
/* The current time */ /* The current time */
struct timespec xtime; struct timespec xtime;
/* /*
* wall_to_monotonic is what we need to add to xtime (or xtime corrected * wall_to_monotonic is what we need to add to xtime (or xtime corrected
* for sub jiffie times) to get to monotonic time. Monotonic is pegged * for sub jiffie times) to get to monotonic time. Monotonic is pegged
@ -64,20 +63,17 @@ struct timekeeper {
* - wall_to_monotonic is no longer the boot time, getboottime must be * - wall_to_monotonic is no longer the boot time, getboottime must be
* used instead. * used instead.
*/ */
struct timespec wall_to_monotonic; struct timespec wall_to_monotonic;
/* time spent in suspend */ /* time spent in suspend */
struct timespec total_sleep_time; struct timespec total_sleep_time;
/* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */ /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */
struct timespec raw_time; struct timespec raw_time;
/* Offset clock monotonic -> clock realtime */ /* Offset clock monotonic -> clock realtime */
ktime_t offs_real; ktime_t offs_real;
/* Offset clock monotonic -> clock boottime */ /* Offset clock monotonic -> clock boottime */
ktime_t offs_boot; ktime_t offs_boot;
/* Seqlock for all timekeeper values */ /* Seqlock for all timekeeper values */
seqlock_t lock; seqlock_t lock;
}; };
static struct timekeeper timekeeper; static struct timekeeper timekeeper;
@ -547,6 +543,7 @@ u64 timekeeping_max_deferment(void)
{ {
unsigned long seq; unsigned long seq;
u64 ret; u64 ret;
do { do {
seq = read_seqbegin(&timekeeper.lock); seq = read_seqbegin(&timekeeper.lock);