diff --git a/include/efi_loader.h b/include/efi_loader.h
index c3640153e13cbd7197c877a32466bfe53de2393b..342e960d145df8b1e1707779222e7187f5403f42 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -122,6 +122,9 @@ efi_status_t efi_create_event(enum efi_event_type type, UINTN notify_tpl,
 					struct efi_event *event,
 					void *context),
 			      void *notify_context, struct efi_event **event);
+/* Call this to set a timer */
+efi_status_t efi_set_timer(struct efi_event *event, int type,
+			   uint64_t trigger_time);
 
 /* Generic EFI memory allocator, call this to get memory */
 void *efi_alloc(uint64_t len, int memory_type);
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 30227cc56c1399f645a689983c0305266d09be0b..4cd06b3c4c22b219cc698fad69ac9977e354e87b 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -252,16 +252,14 @@ void efi_timer_check(void)
 	WATCHDOG_RESET();
 }
 
-static efi_status_t EFIAPI efi_set_timer(struct efi_event *event, int type,
-					 uint64_t trigger_time)
+efi_status_t efi_set_timer(struct efi_event *event, int type,
+			   uint64_t trigger_time)
 {
 	/* We don't have 64bit division available everywhere, so limit timer
 	 * distances to 32bit bits. */
 	u32 trigger32 = trigger_time;
 	int i;
 
-	EFI_ENTRY("%p, %d, %"PRIx64, event, type, trigger_time);
-
 	if (trigger32 < trigger_time) {
 		printf("WARNING: Truncating timer from %"PRIx64" to %x\n",
 		       trigger_time, trigger32);
@@ -283,13 +281,20 @@ static efi_status_t EFIAPI efi_set_timer(struct efi_event *event, int type,
 				timer_get_us() + (trigger32 / 10);
 			break;
 		default:
-			return EFI_EXIT(EFI_INVALID_PARAMETER);
+			return EFI_INVALID_PARAMETER;
 		}
 		event->trigger_type = type;
 		event->trigger_time = trigger_time;
-		return EFI_EXIT(EFI_SUCCESS);
+		return EFI_SUCCESS;
 	}
-	return EFI_EXIT(EFI_INVALID_PARAMETER);
+	return EFI_INVALID_PARAMETER;
+}
+
+static efi_status_t EFIAPI efi_set_timer_ext(struct efi_event *event, int type,
+					 uint64_t trigger_time)
+{
+	EFI_ENTRY("%p, %d, %"PRIx64, event, type, trigger_time);
+	return EFI_EXIT(efi_set_timer(event, type, trigger_time));
 }
 
 static efi_status_t EFIAPI efi_wait_for_event(unsigned long num_events,
@@ -1067,7 +1072,7 @@ static const struct efi_boot_services efi_boot_services = {
 	.allocate_pool = efi_allocate_pool_ext,
 	.free_pool = efi_free_pool_ext,
 	.create_event = efi_create_event_ext,
-	.set_timer = efi_set_timer,
+	.set_timer = efi_set_timer_ext,
 	.wait_for_event = efi_wait_for_event,
 	.signal_event = efi_signal_event_ext,
 	.close_event = efi_close_event,