Index: arch/ppc32/include/asm.h
===================================================================
--- arch/ppc32/include/asm.h	(revision 1084a7848bafa4813443a91f16a7fc9514ecd5d9)
+++ arch/ppc32/include/asm.h	(revision 22f776926d191e0d2eb1be9adfc28070c7ce11d4)
@@ -33,12 +33,14 @@
 #include <config.h>
 
-/** Set priority level low
+/** Enable interrupts.
  *
  * Enable interrupts and return previous
  * value of EE.
+ *
+ * @return Old interrupt priority level.
  */
-static inline pri_t cpu_priority_low(void) {
-	pri_t v;
-	pri_t tmp;
+static inline ipl_t interrupts_enable(void) {
+	ipl_t v;
+	ipl_t tmp;
 	
 	__asm__ volatile (
@@ -52,12 +54,14 @@
 }
 
-/** Set priority level high
+/** Disable interrupts.
  *
  * Disable interrupts and return previous
  * value of EE.
+ *
+ * @return Old interrupt priority level.
  */
-static inline pri_t cpu_priority_high(void) {
-	pri_t v;
-	pri_t tmp;
+static inline ipl_t interrupts_disable(void) {
+	ipl_t v;
+	ipl_t tmp;
 	
 	__asm__ volatile (
@@ -71,10 +75,12 @@
 }
 
-/** Restore priority level
+/** Restore interrupt priority level.
  *
  * Restore EE.
+ *
+ * @param ipl Saved interrupt priority level.
  */
-static inline void cpu_priority_restore(pri_t pri) {
-	pri_t tmp;
+static inline void interrupts_restore(ipl_t ipl) {
+	ipl_t tmp;
 	
 	__asm__ volatile (
@@ -85,15 +91,17 @@
 		"mtmsr %0\n"
 		"0:\n"
-		: "=r" (pri), "=r" (tmp)
-		: "0" (pri)
+		: "=r" (ipl), "=r" (tmp)
+		: "0" (ipl)
 	);
 }
 
-/** Return raw priority level
+/** Return interrupt priority level.
  *
  * Return EE.
+ *
+ * @return Current interrupt priority level.
  */
-static inline pri_t cpu_priority_read(void) {
-	pri_t v;
+static inline ipl_t interrupts_read(void) {
+	ipl_t v;
 	__asm__ volatile (
 		"mfmsr %0\n"
Index: arch/ppc32/include/context.h
===================================================================
--- arch/ppc32/include/context.h	(revision 1084a7848bafa4813443a91f16a7fc9514ecd5d9)
+++ arch/ppc32/include/context.h	(revision 22f776926d191e0d2eb1be9adfc28070c7ce11d4)
@@ -68,5 +68,5 @@
 	__u32 r31;
 	__u32 pc;
-	pri_t pri;
+	ipl_t ipl;
 } __attribute__ ((packed));
 
Index: arch/ppc32/include/types.h
===================================================================
--- arch/ppc32/include/types.h	(revision 1084a7848bafa4813443a91f16a7fc9514ecd5d9)
+++ arch/ppc32/include/types.h	(revision 22f776926d191e0d2eb1be9adfc28070c7ce11d4)
@@ -41,5 +41,5 @@
 typedef __u32 __address;
 
-typedef __u32 pri_t;
+typedef __u32 ipl_t;
 
 typedef __u32 __native;