Commit 0b91317e authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Fix up white space in time.c 



No functional changes.

And remove one redundant prototype.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2c8bc944

arch/x86_64/kernel/time.c

+32 −39
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ unsigned long long monotonic_clock(void) 
			last_offset = vxtime.last;

			base = monotonic_base;

			this_offset = hpet_readl(HPET_COUNTER);



		} while (read_seqretry(&xtime_lock, seq));

		offset = (this_offset - last_offset);

		offset *=(NSEC_PER_SEC/HZ)/hpet_tick;
@@ -305,8 +304,6 @@ unsigned long long monotonic_clock(void) 
		offset = (this_offset - last_offset)*1000/cpu_khz; 

		return base + offset;

	}





}

EXPORT_SYMBOL(monotonic_clock);
@@ -531,10 +528,9 @@ unsigned long get_cmos_time(void) 
	}



	/*

 * Here we are safe to assume the registers won't change for a whole second, so

 * we just go ahead and read them.

	 * Here we are safe to assume the registers won't change for a whole

	 * second, so we just go ahead and read them.

 	 */



	sec = CMOS_READ(RTC_SECONDS);

	min = CMOS_READ(RTC_MINUTES);

	hour = CMOS_READ(RTC_HOURS);
@@ -545,8 +541,8 @@ unsigned long get_cmos_time(void) 
	spin_unlock_irqrestore(&rtc_lock, flags);



	/*

 * We know that x86-64 always uses BCD format, no need to check the config

 * register.

	 * We know that x86-64 always uses BCD format, no need to check the

	 * config register.

 	*/



	BCD_TO_BIN(sec);
@@ -871,8 +867,6 @@ static struct irqaction irq0 = { 
	timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL

};



extern void __init config_acpi_tables(void);



void __init time_init(void)

{

	char *timename;
@@ -992,6 +986,10 @@ __setup("report_lost_ticks", time_setup); 
static long clock_cmos_diff;

static unsigned long sleep_start;



/*

 * sysfs support for the timer.

 */



static int timer_suspend(struct sys_device *dev, pm_message_t state)

{

	/*
@@ -1034,7 +1032,6 @@ static struct sysdev_class timer_sysclass = { 
	set_kset_name("timer"),

};





/* XXX this driverfs stuff should probably go elsewhere later -john */

static struct sys_device device_timer = {

	.id	= 0,
@@ -1276,8 +1273,6 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
}

#endif







static int __init nohpet_setup(char *s) 

{ 

	nohpet = 1;
@@ -1294,5 +1289,3 @@ static int __init notsc_setup(char *s) 
}



__setup("notsc", notsc_setup);