projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-3.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[cascardo/linux.git]
/
include
/
asm-generic
/
irqflags.h
diff --git
a/include/asm-generic/irqflags.h
b/include/asm-generic/irqflags.h
index
9aebf61
..
1f40d00
100644
(file)
--- a/
include/asm-generic/irqflags.h
+++ b/
include/asm-generic/irqflags.h
@@
-5,68
+5,62
@@
* All architectures should implement at least the first two functions,
* usually inline assembly will be the best way.
*/
* All architectures should implement at least the first two functions,
* usually inline assembly will be the best way.
*/
-#ifndef
RAW
_IRQ_DISABLED
-#define
RAW
_IRQ_DISABLED 0
-#define
RAW
_IRQ_ENABLED 1
+#ifndef
ARCH
_IRQ_DISABLED
+#define
ARCH
_IRQ_DISABLED 0
+#define
ARCH
_IRQ_ENABLED 1
#endif
/* read interrupt enabled status */
#endif
/* read interrupt enabled status */
-#ifndef
__raw
_local_save_flags
-unsigned long
__raw
_local_save_flags(void);
+#ifndef
arch
_local_save_flags
+unsigned long
arch
_local_save_flags(void);
#endif
/* set interrupt enabled status */
#endif
/* set interrupt enabled status */
-#ifndef
raw
_local_irq_restore
-void
raw
_local_irq_restore(unsigned long flags);
+#ifndef
arch
_local_irq_restore
+void
arch
_local_irq_restore(unsigned long flags);
#endif
/* get status and disable interrupts */
#endif
/* get status and disable interrupts */
-#ifndef
__raw
_local_irq_save
-static inline unsigned long
__raw
_local_irq_save(void)
+#ifndef
arch
_local_irq_save
+static inline unsigned long
arch
_local_irq_save(void)
{
unsigned long flags;
{
unsigned long flags;
- flags =
__raw
_local_save_flags();
-
raw_local_irq_restore(RAW
_IRQ_DISABLED);
+ flags =
arch
_local_save_flags();
+
arch_local_irq_restore(ARCH
_IRQ_DISABLED);
return flags;
}
#endif
/* test flags */
return flags;
}
#endif
/* test flags */
-#ifndef
raw
_irqs_disabled_flags
-static inline int
raw
_irqs_disabled_flags(unsigned long flags)
+#ifndef
arch
_irqs_disabled_flags
+static inline int
arch
_irqs_disabled_flags(unsigned long flags)
{
{
- return flags ==
RAW
_IRQ_DISABLED;
+ return flags ==
ARCH
_IRQ_DISABLED;
}
#endif
/* unconditionally enable interrupts */
}
#endif
/* unconditionally enable interrupts */
-#ifndef
raw
_local_irq_enable
-static inline void
raw
_local_irq_enable(void)
+#ifndef
arch
_local_irq_enable
+static inline void
arch
_local_irq_enable(void)
{
{
-
raw_local_irq_restore(RAW
_IRQ_ENABLED);
+
arch_local_irq_restore(ARCH
_IRQ_ENABLED);
}
#endif
/* unconditionally disable interrupts */
}
#endif
/* unconditionally disable interrupts */
-#ifndef
raw
_local_irq_disable
-static inline void
raw
_local_irq_disable(void)
+#ifndef
arch
_local_irq_disable
+static inline void
arch
_local_irq_disable(void)
{
{
-
raw_local_irq_restore(RAW
_IRQ_DISABLED);
+
arch_local_irq_restore(ARCH
_IRQ_DISABLED);
}
#endif
/* test hardware interrupt enable bit */
}
#endif
/* test hardware interrupt enable bit */
-#ifndef
raw
_irqs_disabled
-static inline int
raw
_irqs_disabled(void)
+#ifndef
arch
_irqs_disabled
+static inline int
arch
_irqs_disabled(void)
{
{
- return
raw_irqs_disabled_flags(__raw
_local_save_flags());
+ return
arch_irqs_disabled_flags(arch
_local_save_flags());
}
#endif
}
#endif
-#define raw_local_save_flags(flags) \
- do { (flags) = __raw_local_save_flags(); } while (0)
-
-#define raw_local_irq_save(flags) \
- do { (flags) = __raw_local_irq_save(); } while (0)
-
#endif /* __ASM_GENERIC_IRQFLAGS_H */
#endif /* __ASM_GENERIC_IRQFLAGS_H */