mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags: Fix IRQ flag handling naming MIPS: Add missing #inclusions of <linux/irq.h> smc91x: Add missing #inclusion of <linux/irq.h> Drop a couple of unnecessary asm/system.h inclusions SH: Add missing consts to sys_execve() declaration Blackfin: Rename IRQ flags handling functions Blackfin: Add missing dep to asm/irqflags.h Blackfin: Rename DES PC2() symbol to avoid collision Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header Blackfin: Split PLL code from mach-specific cdef headers
This commit is contained in:
commit
e36f561a2c
141 changed files with 2335 additions and 1847 deletions
58
arch/xtensa/include/asm/irqflags.h
Normal file
58
arch/xtensa/include/asm/irqflags.h
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
/*
|
||||
* Xtensa IRQ flags handling functions
|
||||
*
|
||||
* This file is subject to the terms and conditions of the GNU General Public
|
||||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*
|
||||
* Copyright (C) 2001 - 2005 Tensilica Inc.
|
||||
*/
|
||||
|
||||
#ifndef _XTENSA_IRQFLAGS_H
|
||||
#define _XTENSA_IRQFLAGS_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
static inline unsigned long arch_local_save_flags(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
asm volatile("rsr %0,"__stringify(PS) : "=a" (flags));
|
||||
return flags;
|
||||
}
|
||||
|
||||
static inline unsigned long arch_local_irq_save(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
asm volatile("rsil %0, "__stringify(LOCKLEVEL)
|
||||
: "=a" (flags) :: "memory");
|
||||
return flags;
|
||||
}
|
||||
|
||||
static inline void arch_local_irq_disable(void)
|
||||
{
|
||||
arch_local_irq_save();
|
||||
}
|
||||
|
||||
static inline void arch_local_irq_enable(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
asm volatile("rsil %0, 0" : "=a" (flags) :: "memory");
|
||||
}
|
||||
|
||||
static inline void arch_local_irq_restore(unsigned long flags)
|
||||
{
|
||||
asm volatile("wsr %0, "__stringify(PS)" ; rsync"
|
||||
:: "a" (flags) : "memory");
|
||||
}
|
||||
|
||||
static inline bool arch_irqs_disabled_flags(unsigned long flags)
|
||||
{
|
||||
return (flags & 0xf) != 0;
|
||||
}
|
||||
|
||||
static inline bool arch_irqs_disabled(void)
|
||||
{
|
||||
return arch_irqs_disabled_flags(arch_local_save_flags());
|
||||
}
|
||||
|
||||
#endif /* _XTENSA_IRQFLAGS_H */
|
||||
|
|
@ -12,41 +12,10 @@
|
|||
#define _XTENSA_SYSTEM_H
|
||||
|
||||
#include <linux/stringify.h>
|
||||
#include <linux/irqflags.h>
|
||||
|
||||
#include <asm/processor.h>
|
||||
|
||||
/* interrupt control */
|
||||
|
||||
#define local_save_flags(x) \
|
||||
__asm__ __volatile__ ("rsr %0,"__stringify(PS) : "=a" (x));
|
||||
#define local_irq_restore(x) do { \
|
||||
__asm__ __volatile__ ("wsr %0, "__stringify(PS)" ; rsync" \
|
||||
:: "a" (x) : "memory"); } while(0);
|
||||
#define local_irq_save(x) do { \
|
||||
__asm__ __volatile__ ("rsil %0, "__stringify(LOCKLEVEL) \
|
||||
: "=a" (x) :: "memory");} while(0);
|
||||
|
||||
static inline void local_irq_disable(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
__asm__ __volatile__ ("rsil %0, "__stringify(LOCKLEVEL)
|
||||
: "=a" (flags) :: "memory");
|
||||
}
|
||||
static inline void local_irq_enable(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
__asm__ __volatile__ ("rsil %0, 0" : "=a" (flags) :: "memory");
|
||||
|
||||
}
|
||||
|
||||
static inline int irqs_disabled(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
local_save_flags(flags);
|
||||
return flags & 0xf;
|
||||
}
|
||||
|
||||
|
||||
#define smp_read_barrier_depends() do { } while(0)
|
||||
#define read_barrier_depends() do { } while(0)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue