diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 15:34:38 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 15:35:36 +0200 |
commit | db985cbd67c45f875ef43cb5febfaa8cbd203c27 (patch) | |
tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /arch/arm/include/asm/smp_scu.h | |
parent | c6f1224573c3b609bd8073b39f496637a16cc06f (diff) | |
parent | 468a903c0e5147e3f93187f0b808a3ef957fd00e (diff) |
Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18
- renesas: suspend to RAM, runtime PM, cleanups and DT binding docs
- keystone: add new driver
- hip04: add Hisilicon HiP04 driver (without touching irq-gic.c)
- gic: Use defines instead of magic number, preserve v2 bybass bits
- handle_domain_irq: common low level interrupt entry handler
Diffstat (limited to 'arch/arm/include/asm/smp_scu.h')
-rw-r--r-- | arch/arm/include/asm/smp_scu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/smp_scu.h b/arch/arm/include/asm/smp_scu.h index 0393fbab8dd5..bfe163c40024 100644 --- a/arch/arm/include/asm/smp_scu.h +++ b/arch/arm/include/asm/smp_scu.h @@ -11,7 +11,7 @@ static inline bool scu_a9_has_base(void) { - return read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9; + return read_cpuid_part() == ARM_CPU_PART_CORTEX_A9; } static inline unsigned long scu_a9_get_base(void) |