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

Commit 501b6d29 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] iSeries: fix time.c for combined build 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent ad5cb17f

arch/powerpc/kernel/time.c

+4 −3
Original line number Diff line number Diff line
@@ -631,6 +631,7 @@ void timer_interrupt(struct pt_regs * regs) 
	calculate_steal_time();



#ifdef CONFIG_PPC_ISERIES

	if (firmware_has_feature(FW_FEATURE_ISERIES))

		get_lppaca()->int_dword.fields.decr_int = 0;

#endif
@@ -674,7 +675,7 @@ void timer_interrupt(struct pt_regs * regs) 
	set_dec(next_dec);



#ifdef CONFIG_PPC_ISERIES

	if (hvlpevent_is_pending())

	if (firmware_has_feature(FW_FEATURE_ISERIES) && hvlpevent_is_pending())

		process_hvlpevents();

#endif
@@ -774,7 +775,7 @@ int do_settimeofday(struct timespec *tv) 
	 * settimeofday to perform this operation.

	 */

#ifdef CONFIG_PPC_ISERIES

	if (first_settimeofday) {

	if (firmware_has_feature(FW_FEATURE_ISERIES) && first_settimeofday) {

		iSeries_tb_recal();

		first_settimeofday = 0;

	}