Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: sun4m SMP: fix wrong shift instruction in IPI handler sparc32,leon: Added __init declaration to leon_flush_needed() sparc/irqs: Do not trace arch_local_{*,irq_*} functions
This commit is contained in:
commit
d4bd4b40f8
|
@ -18,7 +18,7 @@ extern void arch_local_irq_restore(unsigned long);
|
||||||
extern unsigned long arch_local_irq_save(void);
|
extern unsigned long arch_local_irq_save(void);
|
||||||
extern void arch_local_irq_enable(void);
|
extern void arch_local_irq_enable(void);
|
||||||
|
|
||||||
static inline unsigned long arch_local_save_flags(void)
|
static inline notrace unsigned long arch_local_save_flags(void)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
@ -26,17 +26,17 @@ static inline unsigned long arch_local_save_flags(void)
|
||||||
return flags;
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void arch_local_irq_disable(void)
|
static inline notrace void arch_local_irq_disable(void)
|
||||||
{
|
{
|
||||||
arch_local_irq_save();
|
arch_local_irq_save();
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool arch_irqs_disabled_flags(unsigned long flags)
|
static inline notrace bool arch_irqs_disabled_flags(unsigned long flags)
|
||||||
{
|
{
|
||||||
return (flags & PSR_PIL) != 0;
|
return (flags & PSR_PIL) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool arch_irqs_disabled(void)
|
static inline notrace bool arch_irqs_disabled(void)
|
||||||
{
|
{
|
||||||
return arch_irqs_disabled_flags(arch_local_save_flags());
|
return arch_irqs_disabled_flags(arch_local_save_flags());
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
static inline unsigned long arch_local_save_flags(void)
|
static inline notrace unsigned long arch_local_save_flags(void)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ static inline unsigned long arch_local_save_flags(void)
|
||||||
return flags;
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void arch_local_irq_restore(unsigned long flags)
|
static inline notrace void arch_local_irq_restore(unsigned long flags)
|
||||||
{
|
{
|
||||||
__asm__ __volatile__(
|
__asm__ __volatile__(
|
||||||
"wrpr %0, %%pil"
|
"wrpr %0, %%pil"
|
||||||
|
@ -36,7 +36,7 @@ static inline void arch_local_irq_restore(unsigned long flags)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void arch_local_irq_disable(void)
|
static inline notrace void arch_local_irq_disable(void)
|
||||||
{
|
{
|
||||||
__asm__ __volatile__(
|
__asm__ __volatile__(
|
||||||
"wrpr %0, %%pil"
|
"wrpr %0, %%pil"
|
||||||
|
@ -46,7 +46,7 @@ static inline void arch_local_irq_disable(void)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void arch_local_irq_enable(void)
|
static inline notrace void arch_local_irq_enable(void)
|
||||||
{
|
{
|
||||||
__asm__ __volatile__(
|
__asm__ __volatile__(
|
||||||
"wrpr 0, %%pil"
|
"wrpr 0, %%pil"
|
||||||
|
@ -56,17 +56,17 @@ static inline void arch_local_irq_enable(void)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int arch_irqs_disabled_flags(unsigned long flags)
|
static inline notrace int arch_irqs_disabled_flags(unsigned long flags)
|
||||||
{
|
{
|
||||||
return (flags > 0);
|
return (flags > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int arch_irqs_disabled(void)
|
static inline notrace int arch_irqs_disabled(void)
|
||||||
{
|
{
|
||||||
return arch_irqs_disabled_flags(arch_local_save_flags());
|
return arch_irqs_disabled_flags(arch_local_save_flags());
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline unsigned long arch_local_irq_save(void)
|
static inline notrace unsigned long arch_local_irq_save(void)
|
||||||
{
|
{
|
||||||
unsigned long flags, tmp;
|
unsigned long flags, tmp;
|
||||||
|
|
||||||
|
|
|
@ -293,7 +293,7 @@ maybe_smp4m_msg:
|
||||||
WRITE_PAUSE
|
WRITE_PAUSE
|
||||||
wr %l4, PSR_ET, %psr
|
wr %l4, PSR_ET, %psr
|
||||||
WRITE_PAUSE
|
WRITE_PAUSE
|
||||||
sll %o3, 28, %o2 ! shift for simpler checks below
|
srl %o3, 28, %o2 ! shift for simpler checks below
|
||||||
maybe_smp4m_msg_check_single:
|
maybe_smp4m_msg_check_single:
|
||||||
andcc %o2, 0x1, %g0
|
andcc %o2, 0x1, %g0
|
||||||
beq,a maybe_smp4m_msg_check_mask
|
beq,a maybe_smp4m_msg_check_mask
|
||||||
|
|
|
@ -226,7 +226,7 @@ void leon3_getCacheRegs(struct leon3_cacheregs *regs)
|
||||||
* Leon2 and Leon3 differ in their way of telling cache information
|
* Leon2 and Leon3 differ in their way of telling cache information
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int leon_flush_needed(void)
|
int __init leon_flush_needed(void)
|
||||||
{
|
{
|
||||||
int flush_needed = -1;
|
int flush_needed = -1;
|
||||||
unsigned int ssize, sets;
|
unsigned int ssize, sets;
|
||||||
|
|
Loading…
Reference in New Issue