diff options
author | Tom Rini <trini@konsulko.com> | 2025-03-10 07:49:17 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2025-03-10 07:49:33 -0600 |
commit | 42fd94893e7e0fe4ee1e8c5efa35958459842da6 (patch) | |
tree | 50afa0a3327489e9e9ed4c54087b608301b2c9ce /arch/sandbox/include/asm/setjmp.h | |
parent | 743c15b9fdd2f639012a2c26734dc146dc568218 (diff) | |
parent | cb21476496d6f48712b24045aa7cd3299ad65d99 (diff) |
Merge tag 'efi-next-20250310' of https://source.denx.de/u-boot/custodians/u-boot-efi into next
Pull request efi-next-20250310
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/25043
UEFI:
* Clean up usage of structure jmp_buf_data
* Refactor EFI network protocol implementation for future support
of multiple network interfaces.
- efi_net: let efi_net_set_dp properly update the device path
- expose symbols to be used by the EFI network stack
- efi_setup: Add efi_start_obj_list() to efi_setup.c
- efi_net: Add efi_net_do_start() to efi_net.c
- efi_device_path: Pass net udevice as argument
- efi_net: Add device path cache
- efi_net: Add dhcp cache
- efi_net: Add support for multiple efi_net_obj
Others:
* legacy-net: wget: fix wget_info handling after new tcp legacy stack
* lib: correct description of CONFIG_SYS_FDT_PAD
* Separate setjmp.h into architecture dependent and independent parts
- sandbox: remove linux/types.h dependency in setjmp.h
- arm: include asm-generic/int-ll64.h in setjmp.h
- common: clean up setjmp.h
* arm: use type jmp_buf instead of struct jmp_buf_data
Diffstat (limited to 'arch/sandbox/include/asm/setjmp.h')
-rw-r--r-- | arch/sandbox/include/asm/setjmp.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/sandbox/include/asm/setjmp.h b/arch/sandbox/include/asm/setjmp.h index 001c7ea322d..3413c747783 100644 --- a/arch/sandbox/include/asm/setjmp.h +++ b/arch/sandbox/include/asm/setjmp.h @@ -4,8 +4,8 @@ * Written by Simon Glass <sjg@chromium.org> */ -#ifndef _SETJMP_H_ -#define _SETJMP_H_ +#ifndef _ASM_SETJMP_H_ +#define _ASM_SETJMP_H_ struct jmp_buf_data { /* @@ -19,17 +19,7 @@ struct jmp_buf_data { * We don't need to worry about 16-byte alignment, since this does not * run on Windows. */ - ulong data[128]; + unsigned long data[128]; }; -typedef struct jmp_buf_data jmp_buf[1]; - -/* - * We have to directly link with the system versions of - * setjmp/longjmp, because setjmp must not return as otherwise - * the stack may become invalid. - */ -int setjmp(jmp_buf jmp); -__noreturn void longjmp(jmp_buf jmp, int ret); - -#endif /* _SETJMP_H_ */ +#endif /* _ASM_SETJMP_H_ */ |