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

Commit 70f4f935 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Tony Luck
Browse files

ia64: efi: use timespec64 for persistent clock 



We have a generic read_persistent_clock64 interface now, and can
change the ia64 implementation to provide that instead of
read_persistent_clock.

The main point of this is to avoid the use of struct timespec
in the global efi.h, which would cause build errors as soon
as we want to build a kernel without 'struct timespec' defined
on 32-bit architectures.

Aside from this, we get a little closer to removing the
__weak read_persistent_clock() definition, which relies on
converting all architectures to provide read_persistent_clock64
instead.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 5edb5649

arch/ia64/kernel/efi.c

+2 −2
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ STUB_GET_NEXT_HIGH_MONO_COUNT(virt, id) 
STUB_RESET_SYSTEM(virt, id)



void

efi_gettimeofday (struct timespec *ts)

efi_gettimeofday (struct timespec64 *ts)

{

	efi_time_t tm;
@@ -245,7 +245,7 @@ efi_gettimeofday (struct timespec *ts) 
		return;

	}



	ts->tv_sec = mktime(tm.year, tm.month, tm.day,

	ts->tv_sec = mktime64(tm.year, tm.month, tm.day,

			    tm.hour, tm.minute, tm.second);

	ts->tv_nsec = tm.nanosecond;

}

arch/ia64/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static struct irqaction timer_irqaction = { 
	.name =		"timer"

};



void read_persistent_clock(struct timespec *ts)

void read_persistent_clock64(struct timespec64 *ts)

{

	efi_gettimeofday(ts);

}

include/linux/efi.h

+1 −1
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ extern void efi_init (void); 
extern void *efi_get_pal_addr (void);

extern void efi_map_pal_code (void);

extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);

extern void efi_gettimeofday (struct timespec *ts);

extern void efi_gettimeofday (struct timespec64 *ts);

extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if possible */

#ifdef CONFIG_X86

extern void efi_late_init(void);