diff options
| author |   Will Deacon <will.deacon@arm.com> | 2015-08-05 14:14:06 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-08-05 14:14:06 +0100 |
| commit | d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4 (patch) | |
| tree | a4769135920d8ec4ded9569f89c231130980ba42 /arch/arm64/include | |
| parent | arm64: mm: ensure patched kernel text is fetched from PoU (diff) | |
| parent | MAINTAINERS: add PSCI entry (diff) | |
| download | linux-dev-d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4.tar.xz linux-dev-d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4.zip | |
Merge branch 'aarch64/psci/drivers' into aarch64/for-next/core
Move our PSCI implementation out into drivers/firmware/ where it can be
shared with arch/arm/.
Conflicts:
arch/arm64/kernel/psci.c
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/acpi.h | 4 | ||||
| -rw-r--r-- | arch/arm64/include/asm/psci.h | 28 |
2 files changed, 2 insertions, 30 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 406485ed110a..208cec08a74f 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -12,11 +12,11 @@ #ifndef _ASM_ACPI_H #define _ASM_ACPI_H -#include <linux/mm.h> #include <linux/irqchip/arm-gic-acpi.h> +#include <linux/mm.h> +#include <linux/psci.h> #include <asm/cputype.h> -#include <asm/psci.h> #include <asm/smp_plat.h> /* Macros for consistency checks of the GICC subtable of MADT */ diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/psci.h deleted file mode 100644 index 49d7e1aaebdc..000000000000 --- a/arch/arm64/include/asm/psci.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Copyright (C) 2013 ARM Limited - */ - -#ifndef __ASM_PSCI_H -#define __ASM_PSCI_H - -int __init psci_dt_init(void); - -#ifdef CONFIG_ACPI -int __init psci_acpi_init(void); -bool __init acpi_psci_present(void); -bool __init acpi_psci_use_hvc(void); -#else -static inline int psci_acpi_init(void) { return 0; } -static inline bool acpi_psci_present(void) { return false; } -#endif - -#endif /* __ASM_PSCI_H */ |