diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-03 17:52:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-03 17:52:40 -0500 |
| commit | f388e3bed7318efe97058b673801dda6f563d319 (patch) | |
| tree | ed391f6b8cfad1bc53dabeb7239ffcc716a8ca4e /include/linux/psci.h | |
| parent | ec0d0d8742df12a4c0d3e8382b77c0672cd4aab6 (diff) | |
| parent | 1a82b3413cb577cd52cf8a1dc22dd306e4ce0772 (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-12-03
This release is fully packed with lots of glorious improvements in UEFI
land again!
- Make PE images more standards compliant
- Improve sandbox support
- Improve correctness
- Fix RISC-V execution on virt model
- Honor board defined top of ram (fixes a few boards)
- Imply DM USB access when distro boot is available
- Code cleanups
Diffstat (limited to 'include/linux/psci.h')
| -rw-r--r-- | include/linux/psci.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h index 8d13bd27021..9433df836b6 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -88,10 +88,8 @@ #define PSCI_RET_DISABLED -8 #ifdef CONFIG_ARM_PSCI_FW -typedef unsigned long (psci_fn)(unsigned long, unsigned long, - unsigned long, unsigned long); - -extern psci_fn *invoke_psci_fn; +unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3); #else unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3) |