diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-09-22 10:12:16 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-22 10:12:16 +0200 |
commit | 7639913f7298ed23a3f026ebcbb3b4e8850bcc39 (patch) | |
tree | 26f08f061535015b748a96106f4869560e3afc63 /arch/arm/include/asm/smp_plat.h | |
parent | 4e9c58cb1219bcbcf6e698ed6541b275048bfa88 (diff) | |
parent | f8fb117034847634bff8f02632151f7535981fa1 (diff) |
Merge branch 'topic/hda-jack-rework' into for-next
This is a merge of rework of HD-audio jack event handling code.
It extends the jack table to allow multiple callbacks.
Diffstat (limited to 'arch/arm/include/asm/smp_plat.h')
-rw-r--r-- | arch/arm/include/asm/smp_plat.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/include/asm/smp_plat.h b/arch/arm/include/asm/smp_plat.h index a252c0bfacf5..0ad7d490ee6f 100644 --- a/arch/arm/include/asm/smp_plat.h +++ b/arch/arm/include/asm/smp_plat.h @@ -8,6 +8,7 @@ #include <linux/cpumask.h> #include <linux/err.h> +#include <asm/cpu.h> #include <asm/cputype.h> /* @@ -25,6 +26,20 @@ static inline bool is_smp(void) #endif } +/** + * smp_cpuid_part() - return part id for a given cpu + * @cpu: logical cpu id. + * + * Return: part id of logical cpu passed as argument. + */ +static inline unsigned int smp_cpuid_part(int cpu) +{ + struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpu); + + return is_smp() ? cpu_info->cpuid & ARM_CPU_PART_MASK : + read_cpuid_part(); +} + /* all SMP configurations have the extended CPUID registers */ #ifndef CONFIG_MMU #define tlb_ops_need_broadcast() 0 |