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

1 files changed, 0 insertions, 76 deletions

diff --git a/arch/ia64/include/asm/system.h b/arch/ia64/include/asm/system.h
index dd028f2b13b3..6cca30705d50 100644
--- a/arch/ia64/include/asm/system.h
+++ b/arch/ia64/include/asm/system.h
@@ -107,87 +107,11 @@ extern struct ia64_boot_param {
  */
 #define set_mb(var, value)      do { (var) = (value); mb(); } while (0)
 
-#define safe_halt()         ia64_pal_halt_light()    /* PAL_HALT_LIGHT */
-
 /*
  * The group barrier in front of the rsm & ssm are necessary to ensure
  * that none of the previous instructions in the same group are
  * affected by the rsm/ssm.
  */
-/* For spinlocks etc */
-
-/*
- * - clearing psr.i is implicitly serialized (visible by next insn)
- * - setting psr.i requires data serialization
- * - we need a stop-bit before reading PSR because we sometimes
- *   write a floating-point register right before reading the PSR
- *   and that writes to PSR.mfl
- */
-#ifdef CONFIG_PARAVIRT
-#define __local_save_flags()    ia64_get_psr_i()
-#else
-#define __local_save_flags()    ia64_getreg(_IA64_REG_PSR)
-#endif
-
-#define __local_irq_save(x)                     \
-do {                                            \
-        ia64_stop();                            \
-        (x) = __local_save_flags();             \
-        ia64_stop();                            \
-        ia64_rsm(IA64_PSR_I);                   \
-} while (0)
-
-#define __local_irq_disable()                   \
-do {                                            \
-        ia64_stop();                            \
-        ia64_rsm(IA64_PSR_I);                   \
-} while (0)
-
-#define __local_irq_restore(x)  ia64_intrin_local_irq_restore((x) & IA64_PSR_I)
-
-#ifdef CONFIG_IA64_DEBUG_IRQ
-
-  extern unsigned long last_cli_ip;
-
-# define __save_ip()            last_cli_ip = ia64_getreg(_IA64_REG_IP)
-
-# define local_irq_save(x)                                      \
-do {                                                            \
-        unsigned long __psr;                                    \
-                                                                \
-        __local_irq_save(__psr);                                \
-        if (__psr & IA64_PSR_I)                                 \
-                __save_ip();                                    \
-        (x) = __psr;                                            \
-} while (0)
-
-# define local_irq_disable()    do { unsigned long __x; local_irq_save(__x); } while (0)
-
-# define local_irq_restore(x)                                   \
-do {                                                            \
-        unsigned long __old_psr, __psr = (x);                   \
-                                                                \
-        local_save_flags(__old_psr);                            \
-        __local_irq_restore(__psr);                             \
-        if ((__old_psr & IA64_PSR_I) && !(__psr & IA64_PSR_I))  \
-                __save_ip();                                    \
-} while (0)
-
-#else /* !CONFIG_IA64_DEBUG_IRQ */
-# define local_irq_save(x)      __local_irq_save(x)
-# define local_irq_disable()    __local_irq_disable()
-# define local_irq_restore(x)   __local_irq_restore(x)
-#endif /* !CONFIG_IA64_DEBUG_IRQ */
-
-#define local_irq_enable()      ({ ia64_stop(); ia64_ssm(IA64_PSR_I); ia64_srlz_d(); })
-#define local_save_flags(flags) ({ ia64_stop(); (flags) = __local_save_flags(); })
-
-#define irqs_disabled()                         \
-({                                              \
-        unsigned long __ia64_id_flags;          \
-        local_save_flags(__ia64_id_flags);      \
-        (__ia64_id_flags & IA64_PSR_I) == 0;    \
-})
 
 #ifdef __KERNEL__