diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-07 14:26:42 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-07 14:26:42 +0100 |
| commit | 047d617c6449da6b17a3b844802bb5e127fef7c3 (patch) | |
| tree | 6d28caf8a4f7c155b3406d71a0b5f7c38f844eac /common | |
| parent | cd8a909bb3e7af6d905e4b554b10a3bf9718f5c5 (diff) | |
| parent | cbfdbf38c190bc9197f85c9633f103cdc15de571 (diff) | |
| download | barebox-047d617c6449da6b17a3b844802bb5e127fef7c3.tar.gz barebox-047d617c6449da6b17a3b844802bb5e127fef7c3.tar.xz | |
Merge branch 'for-next/watchdog'
Diffstat (limited to 'common')
| -rw-r--r-- | common/boot.c | 3 | ||||
| -rw-r--r-- | common/efi/efi-image.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/boot.c b/common/boot.c index 14d4fe9d64..dcbe5cc2ec 100644 --- a/common/boot.c +++ b/common/boot.c @@ -146,7 +146,8 @@ int boot_entry(struct bootentry *be, int verbose, int dryrun) printf("Booting entry '%s'\n", be->title); if (IS_ENABLED(CONFIG_WATCHDOG) && boot_watchdog_timeout) { - ret = watchdog_set_timeout(boot_watchdog_timeout); + ret = watchdog_set_timeout(watchdog_get_default(), + boot_watchdog_timeout); if (ret) pr_warn("Failed to enable watchdog: %s\n", strerror(-ret)); } diff --git a/common/efi/efi-image.c b/common/efi/efi-image.c index 939663a6e2..9c66c9f882 100644 --- a/common/efi/efi-image.c +++ b/common/efi/efi-image.c @@ -174,7 +174,6 @@ static inline void linux_efi_handover(efi_handle_t handle, { handover_fn handover; - asm volatile ("cli"); handover = (handover_fn)((long)header->code32_start + 512 + header->handover_offset); handover(handle, efi_sys_table, header); |