Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.

1 files changed, 22 insertions, 22 deletions

diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c
index a4dba6b20bd0..a6d5381c94fe 100644
--- a/arch/frv/kernel/gdb-stub.c
+++ b/arch/frv/kernel/gdb-stub.c
@@ -672,7 +672,7 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         if ((uint32_t)mem&1 && count>=1) {
                 if (!gdbstub_read_byte(mem,ch))
                         return NULL;
-                buf = pack_hex_byte(buf, ch[0]);
+                buf = hex_byte_pack(buf, ch[0]);
                 mem++;
                 count--;
         }
@@ -680,8 +680,8 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         if ((uint32_t)mem&3 && count>=2) {
                 if (!gdbstub_read_word(mem,(uint16_t *)ch))
                         return NULL;
-                buf = pack_hex_byte(buf, ch[0]);
-                buf = pack_hex_byte(buf, ch[1]);
+                buf = hex_byte_pack(buf, ch[0]);
+                buf = hex_byte_pack(buf, ch[1]);
                 mem += 2;
                 count -= 2;
         }
@@ -689,10 +689,10 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         while (count>=4) {
                 if (!gdbstub_read_dword(mem,(uint32_t *)ch))
                         return NULL;
-                buf = pack_hex_byte(buf, ch[0]);
-                buf = pack_hex_byte(buf, ch[1]);
-                buf = pack_hex_byte(buf, ch[2]);
-                buf = pack_hex_byte(buf, ch[3]);
+                buf = hex_byte_pack(buf, ch[0]);
+                buf = hex_byte_pack(buf, ch[1]);
+                buf = hex_byte_pack(buf, ch[2]);
+                buf = hex_byte_pack(buf, ch[3]);
                 mem += 4;
                 count -= 4;
         }
@@ -700,8 +700,8 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         if (count>=2) {
                 if (!gdbstub_read_word(mem,(uint16_t *)ch))
                         return NULL;
-                buf = pack_hex_byte(buf, ch[0]);
-                buf = pack_hex_byte(buf, ch[1]);
+                buf = hex_byte_pack(buf, ch[0]);
+                buf = hex_byte_pack(buf, ch[1]);
                 mem += 2;
                 count -= 2;
         }
@@ -709,7 +709,7 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa
         if (count>=1) {
                 if (!gdbstub_read_byte(mem,ch))
                         return NULL;
-                buf = pack_hex_byte(buf, ch[0]);
+                buf = hex_byte_pack(buf, ch[0]);
         }
 
         *buf = 0;
@@ -1498,21 +1498,21 @@ void gdbstub(int sigval)
                 ptr = mem2hex(title, ptr, sizeof(title) - 1,0);
 
                 hx = hex_asc_hi(brr >> 24);
-                ptr = pack_hex_byte(ptr, hx);
+                ptr = hex_byte_pack(ptr, hx);
                 hx = hex_asc_lo(brr >> 24);
-                ptr = pack_hex_byte(ptr, hx);
+                ptr = hex_byte_pack(ptr, hx);
                 hx = hex_asc_hi(brr >> 16);
-                ptr = pack_hex_byte(ptr, hx);
+                ptr = hex_byte_pack(ptr, hx);
                 hx = hex_asc_lo(brr >> 16);
-                ptr = pack_hex_byte(ptr, hx);
+                ptr = hex_byte_pack(ptr, hx);
                 hx = hex_asc_hi(brr >> 8);
-                ptr = pack_hex_byte(ptr, hx);
+                ptr = hex_byte_pack(ptr, hx);
                 hx = hex_asc_lo(brr >> 8);
-                ptr = pack_hex_byte(ptr, hx);
+                ptr = hex_byte_pack(ptr, hx);
                 hx = hex_asc_hi(brr);
-                ptr = pack_hex_byte(ptr, hx);
+                ptr = hex_byte_pack(ptr, hx);
                 hx = hex_asc_lo(brr);
-                ptr = pack_hex_byte(ptr, hx);
+                ptr = hex_byte_pack(ptr, hx);
 
                 ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0);
                 *ptr = 0;
@@ -1526,10 +1526,10 @@ void gdbstub(int sigval)
 
         /* Send trap type (converted to signal) */
         *ptr++ = 'T';
-        ptr = pack_hex_byte(ptr, sigval);
+        ptr = hex_byte_pack(ptr, sigval);
 
         /* Send Error PC */
-        ptr = pack_hex_byte(ptr, GDB_REG_PC);
+        ptr = hex_byte_pack(ptr, GDB_REG_PC);
         *ptr++ = ':';
         ptr = mem2hex(&__debug_frame->pc, ptr, 4, 0);
         *ptr++ = ';';
@@ -1537,7 +1537,7 @@ void gdbstub(int sigval)
         /*
          * Send frame pointer
          */
-        ptr = pack_hex_byte(ptr, GDB_REG_FP);
+        ptr = hex_byte_pack(ptr, GDB_REG_FP);
         *ptr++ = ':';
         ptr = mem2hex(&__debug_frame->fp, ptr, 4, 0);
         *ptr++ = ';';
@@ -1545,7 +1545,7 @@ void gdbstub(int sigval)
         /*
          * Send stack pointer
          */
-        ptr = pack_hex_byte(ptr, GDB_REG_SP);
+        ptr = hex_byte_pack(ptr, GDB_REG_SP);
         *ptr++ = ':';
         ptr = mem2hex(&__debug_frame->sp, ptr, 4, 0);
         *ptr++ = ';';