mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix incorrect return value from ia64_setup_msi_irq() [IA64] arch/ia64/sn/kernel/mca.c: undo lock when sn_oemdata can't be extended [IA64] update sn2 defconfig to 64kb pages [IA64] fix typo in per_cpu_offset [IA64] /proc/cpuinfo "physical id" field cleanups [IA64] vDSO vs --build-id [IA64] check-segrel.lds vs --build-id [IA64] vmcore_find_descriptor_size should be in __init [IA64] ia64/mm/init.c: fix section mismatches
This commit is contained in:
commit
e58b7dab27
11 changed files with 86 additions and 106 deletions
|
|
@ -46,7 +46,7 @@
|
|||
#ifdef CONFIG_SMP
|
||||
|
||||
extern unsigned long __per_cpu_offset[NR_CPUS];
|
||||
#define per_cpu_offset(x) (__per_cpu_offset(x))
|
||||
#define per_cpu_offset(x) (__per_cpu_offset[x])
|
||||
|
||||
/* Equal to __per_cpu_offset[smp_processor_id()], but faster to access: */
|
||||
DECLARE_PER_CPU(unsigned long, local_per_cpu_offset);
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ extern cpumask_t cpu_online_map;
|
|||
extern cpumask_t cpu_core_map[NR_CPUS];
|
||||
DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
|
||||
extern int smp_num_siblings;
|
||||
extern int smp_num_cpucores;
|
||||
extern void __iomem *ipi_base_addr;
|
||||
extern unsigned char smp_int_redirect;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue