Rename irqsave() and irqrestore() to up_irq_save() and up_irq_restore()

arch/x86/include/i486/irq.h

@@ -193,6 +193,15 @@ struct xcptcontext
 
 #ifndef __ASSEMBLY__
 
+/* Name: up_irq_save, up_irq_restore, and friends.
+ *
+ * NOTE: This function should never be called from application code and,
+ * as a general rule unless you really know what you are doing, this
+ * function should not be called directly from operation system code either:
+ * Typically, the wrapper functions, enter_critical_section() and
+ * leave_critical section(), are probably what you really want.
+ */
+
 /* Get the current FLAGS register contents */
 
 static inline irqstate_t irqflags()
@@ -239,7 +248,7 @@ static inline void irqenable(void)
 
 /* Disable interrupts, but return previous interrupt state */
 
-static inline irqstate_t irqsave(void)
+static inline irqstate_t up_irq_save(void)
 {
   irqstate_t flags = irqflags();
   irqdisable();
@@ -248,7 +257,7 @@ static inline irqstate_t irqsave(void)
 
 /* Conditionally disable interrupts */
 
-static inline void irqrestore(irqstate_t flags)
+static inline void up_irq_restore(irqstate_t flags)
 {
   if (irqenabled(flags))
     {

arch/x86/include/i486/types.h

@@ -83,7 +83,7 @@ typedef signed int         _intptr_t;
 typedef unsigned int       _uintptr_t;
 
 /* This is the size of the interrupt state save returned by
- * irqsave()
+ * up_irq_save()
  */
 
 typedef unsigned int       irqstate_t;

arch/x86/include/irq.h

@@ -53,7 +53,7 @@
 #include <arch/chip/irq.h>
 
 /* Include architecture-specific IRQ definitions (including register save
- * structure and irqsave()/irqrestore() macros).
+ * structure and up_irq_save()/up_irq_restore() macros).
  */
 
 #ifdef CONFIG_ARCH_I486