diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-10 16:38:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-10 16:38:40 -0500 |
| commit | ef2f0d323652c1162937df668b33b3bfe0ca3904 (patch) | |
| tree | f957b7e9edcf79403f8a582d17dc4103f293fc10 /arch/arm/include/asm/system.h | |
| parent | c00bd81ae0d6eb1f94e26b31be3a64cadaa05bcb (diff) | |
| parent | 4f731c795d75aee548f6886f4f0da0a49a99354d (diff) | |
Merge branch '2020-01-10-master-imports'
- Android image support enhancements
- Assorted ARM fixes and enhancements
- m68k update
Diffstat (limited to 'arch/arm/include/asm/system.h')
| -rw-r--r-- | arch/arm/include/asm/system.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index a1a5e35ef6f..81ccead1127 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -254,6 +254,7 @@ void mmu_change_region_attr(phys_addr_t start, size_t size, u64 attrs); void smc_call(struct pt_regs *args); void __noreturn psci_system_reset(void); +void __noreturn psci_system_reset2(u32 reset_level, u32 cookie); void __noreturn psci_system_off(void); #ifdef CONFIG_ARMV8_PSCI |