2 files changed, 7 insertions, 3 deletions

diff --git a/arch/mips/include/asm/netlogic/xlr/fmn.h b/arch/mips/include/asm/netlogic/xlr/fmn.h
index 2a78929cef73..56c7b85ea7dd 100644
--- a/arch/mips/include/asm/netlogic/xlr/fmn.h
+++ b/arch/mips/include/asm/netlogic/xlr/fmn.h
@@ -175,6 +175,10 @@
 #define nlm_write_c2_cc14(s, v)         __write_32bit_c2_register($30, s, v)
 #define nlm_write_c2_cc15(s, v)         __write_32bit_c2_register($31, s, v)
 
+#define nlm_read_c2_status0()           __read_32bit_c2_register($2, 0)
+#define nlm_write_c2_status0(v)         __write_32bit_c2_register($2, 0, v)
+#define nlm_read_c2_status1()           __read_32bit_c2_register($2, 1)
+#define nlm_write_c2_status1(v)         __write_32bit_c2_register($2, 1, v)
 #define nlm_read_c2_status(sel)         __read_32bit_c2_register($2, 0)
 #define nlm_read_c2_config()            __read_32bit_c2_register($3, 0)
 #define nlm_write_c2_config(v)          __write_32bit_c2_register($3, 0, v)
@@ -296,7 +300,7 @@ static inline int nlm_fmn_send(unsigned int size, unsigned int code,
          */
         for (i = 0; i < 8; i++) {
                 nlm_msgsnd(dest);
-                status = nlm_read_c2_status(0);
+                status = nlm_read_c2_status0();
                 if ((status & 0x2) == 1)
                         pr_info("Send pending fail!\n");
                 if ((status & 0x4) == 0)
@@ -316,7 +320,7 @@ static inline int nlm_fmn_receive(int bucket, int *size, int *code, int *stid,
 
         /* wait for load pending to clear */
         do {
-                status = nlm_read_c2_status(1);
+                status = nlm_read_c2_status0();
         } while ((status & 0x08) != 0);
 
         /* receive error bits */
diff --git a/arch/mips/netlogic/xlr/fmn.c b/arch/mips/netlogic/xlr/fmn.c
index 4d74f03de506..0fdce61857cd 100644
--- a/arch/mips/netlogic/xlr/fmn.c
+++ b/arch/mips/netlogic/xlr/fmn.c
@@ -80,7 +80,7 @@ static irqreturn_t fmn_message_handler(int irq, void *data)
         while (1) {
                 /* 8 bkts per core, [24:31] each bit represents one bucket
                  * Bit is Zero if bucket is not empty */
-                bkt_status = (nlm_read_c2_status() >> 24) & 0xff;
+                bkt_status = (nlm_read_c2_status0() >> 24) & 0xff;
                 if (bkt_status == 0xff)
                         break;
                 for (bucket = 0; bucket < 8; bucket++) {