diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-10-23 16:07:20 +0100 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-10-24 01:46:57 +0100 |
| commit | 84a982e37e9f76c5632f23726cca2cd4826f2c20 (patch) | |
| tree | d5568bc1c2a6c3398975ed5c5c8c89abdbc7cb46 /arch/arm/include/asm/processor.h | |
| parent | 1857c8849bf548ba9c696a2b6d8188eb7ae753e2 (diff) | |
| parent | f9de2a656b3d170e0f385ea9566ff27e21466f55 (diff) | |
Merge branch 'acpi' of git://git.linaro.org/arm/acpi/acpi into leg-kernelleg-20131023.1
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/io.h
arch/arm/kernel/setup.c
arch/arm/mm/early_ioremap.c
arch/arm/mm/mmu.c
arch/arm64/Kconfig
arch/arm64/include/asm/io.h
arch/arm64/kernel/setup.c
arch/arm64/mm/ioremap.c
Diffstat (limited to 'arch/arm/include/asm/processor.h')
| -rw-r--r-- | arch/arm/include/asm/processor.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 413f3876341c..abff94afa776 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h @@ -108,6 +108,19 @@ static inline void prefetch(const void *ptr) #define ARCH_HAS_SPINLOCK_PREFETCH #define spin_lock_prefetch(x) do { } while (0) +/* + * Not all ARM devices have ACPI, but some do + * BOZO: is this correct? + */ +#ifdef CONFIG_ACPI +enum idle_boot_override { IDLE_NO_OVERRIDE = 0, IDLE_HALT, IDLE_NOMWAIT, + IDLE_POLL, IDLE_FORCE_MWAIT }; + +extern unsigned long boot_option_idle_override; +#endif + +/* end BOZO */ + #endif #define HAVE_ARCH_PICK_MMAP_LAYOUT |