39c715b717
This patch implements a number of smp_processor_id() cleanup ideas that
Arjan van de Ven and I came up with.
The previous __smp_processor_id/_smp_processor_id/smp_processor_id API
spaghetti was hard to follow both on the implementational and on the
usage side.
Some of the complexity arose from picking wrong names, some of the
complexity comes from the fact that not all architectures defined
__smp_processor_id.
In the new code, there are two externally visible symbols:
- smp_processor_id(): debug variant.
- raw_smp_processor_id(): nondebug variant. Replaces all existing
uses of _smp_processor_id() and __smp_processor_id(). Defined
by every SMP architecture in include/asm-*/smp.h.
There is one new internal symbol, dependent on DEBUG_PREEMPT:
- debug_smp_processor_id(): internal debug variant, mapped to
smp_processor_id().
Also, i moved debug_smp_processor_id() from lib/kernel_lock.c into a new
lib/smp_processor_id.c file. All related comments got updated and/or
clarified.
I have build/boot tested the following 8 .config combinations on x86:
{SMP,UP} x {PREEMPT,!PREEMPT} x {DEBUG_PREEMPT,!DEBUG_PREEMPT}
I have also build/boot tested x64 on UP/PREEMPT/DEBUG_PREEMPT. (Other
architectures are untested, but should work just fine.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
63 lines
1.4 KiB
C
63 lines
1.4 KiB
C
#ifndef __ASM_SMP_H
|
|
#define __ASM_SMP_H
|
|
|
|
#include <linux/config.h>
|
|
#include <linux/threads.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/bitops.h>
|
|
#include <asm/pal.h>
|
|
|
|
/* HACK: Cabrio WHAMI return value is bogus if more than 8 bits used.. :-( */
|
|
|
|
static __inline__ unsigned char
|
|
__hard_smp_processor_id(void)
|
|
{
|
|
register unsigned char __r0 __asm__("$0");
|
|
__asm__ __volatile__(
|
|
"call_pal %1 #whami"
|
|
: "=r"(__r0)
|
|
:"i" (PAL_whami)
|
|
: "$1", "$22", "$23", "$24", "$25");
|
|
return __r0;
|
|
}
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
#include <asm/irq.h>
|
|
|
|
struct cpuinfo_alpha {
|
|
unsigned long loops_per_jiffy;
|
|
unsigned long last_asn;
|
|
int need_new_asn;
|
|
int asn_lock;
|
|
unsigned long ipi_count;
|
|
unsigned long prof_multiplier;
|
|
unsigned long prof_counter;
|
|
unsigned char mcheck_expected;
|
|
unsigned char mcheck_taken;
|
|
unsigned char mcheck_extra;
|
|
} __attribute__((aligned(64)));
|
|
|
|
extern struct cpuinfo_alpha cpu_data[NR_CPUS];
|
|
|
|
#define PROC_CHANGE_PENALTY 20
|
|
|
|
#define hard_smp_processor_id() __hard_smp_processor_id()
|
|
#define raw_smp_processor_id() (current_thread_info()->cpu)
|
|
|
|
extern cpumask_t cpu_present_mask;
|
|
extern cpumask_t cpu_online_map;
|
|
extern int smp_num_cpus;
|
|
#define cpu_possible_map cpu_present_mask
|
|
|
|
int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, int wait, cpumask_t cpu);
|
|
|
|
#else /* CONFIG_SMP */
|
|
|
|
#define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })
|
|
|
|
#endif /* CONFIG_SMP */
|
|
|
|
#define NO_PROC_ID (-1)
|
|
|
|
#endif
|