diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/include/asm/unistd.h | 4 | ||||
-rw-r--r-- | arch/alpha/kernel/systbls.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx27_3ds.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx31_3ds.c | 6 | ||||
-rw-r--r-- | arch/cris/arch-v10/kernel/kgdb.c | 6 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/kgdb.c | 14 | ||||
-rw-r--r-- | arch/frv/kernel/gdb-stub.c | 44 | ||||
-rw-r--r-- | arch/mn10300/kernel/gdb-stub.c | 52 | ||||
-rw-r--r-- | arch/powerpc/include/asm/systbl.h | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/unistd.h | 4 | ||||
-rw-r--r-- | arch/x86/ia32/ia32entry.S | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/unistd_32.h | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/unistd_64.h | 4 | ||||
-rw-r--r-- | arch/x86/kernel/syscall_table_32.S | 2 |
14 files changed, 83 insertions, 69 deletions
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index 4ac48a095f3a..2207fc61665d 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h | |||
@@ -457,10 +457,12 @@ | |||
457 | #define __NR_clock_adjtime 499 | 457 | #define __NR_clock_adjtime 499 |
458 | #define __NR_syncfs 500 | 458 | #define __NR_syncfs 500 |
459 | #define __NR_setns 501 | 459 | #define __NR_setns 501 |
460 | #define __NR_accept4 502 | ||
461 | #define __NR_sendmmsg 503 | ||
460 | 462 | ||
461 | #ifdef __KERNEL__ | 463 | #ifdef __KERNEL__ |
462 | 464 | ||
463 | #define NR_SYSCALLS 502 | 465 | #define NR_SYSCALLS 504 |
464 | 466 | ||
465 | #define __ARCH_WANT_IPC_PARSE_VERSION | 467 | #define __ARCH_WANT_IPC_PARSE_VERSION |
466 | #define __ARCH_WANT_OLD_READDIR | 468 | #define __ARCH_WANT_OLD_READDIR |
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index 6acea1f96de3..e534e1c5bc11 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S | |||
@@ -520,6 +520,8 @@ sys_call_table: | |||
520 | .quad sys_clock_adjtime | 520 | .quad sys_clock_adjtime |
521 | .quad sys_syncfs /* 500 */ | 521 | .quad sys_syncfs /* 500 */ |
522 | .quad sys_setns | 522 | .quad sys_setns |
523 | .quad sys_accept4 | ||
524 | .quad sys_sendmmsg | ||
523 | 525 | ||
524 | .size sys_call_table, . - sys_call_table | 526 | .size sys_call_table, . - sys_call_table |
525 | .type sys_call_table, @object | 527 | .type sys_call_table, @object |
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 2eafbac2c763..377230497dcc 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
@@ -241,7 +241,7 @@ static struct regulator_init_data gpo_init = { | |||
241 | }; | 241 | }; |
242 | 242 | ||
243 | static struct regulator_consumer_supply vmmc1_consumers[] = { | 243 | static struct regulator_consumer_supply vmmc1_consumers[] = { |
244 | REGULATOR_SUPPLY("lcd_2v8", NULL), | 244 | REGULATOR_SUPPLY("vcore", "spi0.0"), |
245 | }; | 245 | }; |
246 | 246 | ||
247 | static struct regulator_init_data vmmc1_init = { | 247 | static struct regulator_init_data vmmc1_init = { |
@@ -257,7 +257,7 @@ static struct regulator_init_data vmmc1_init = { | |||
257 | }; | 257 | }; |
258 | 258 | ||
259 | static struct regulator_consumer_supply vgen_consumers[] = { | 259 | static struct regulator_consumer_supply vgen_consumers[] = { |
260 | REGULATOR_SUPPLY("vdd_lcdio", NULL), | 260 | REGULATOR_SUPPLY("vdd", "spi0.0"), |
261 | }; | 261 | }; |
262 | 262 | ||
263 | static struct regulator_init_data vgen_init = { | 263 | static struct regulator_init_data vgen_init = { |
@@ -348,8 +348,6 @@ static const struct imx_fb_platform_data mx27_3ds_fb_data __initconst = { | |||
348 | static struct l4f00242t03_pdata mx27_3ds_lcd_pdata = { | 348 | static struct l4f00242t03_pdata mx27_3ds_lcd_pdata = { |
349 | .reset_gpio = LCD_RESET, | 349 | .reset_gpio = LCD_RESET, |
350 | .data_enable_gpio = LCD_ENABLE, | 350 | .data_enable_gpio = LCD_ENABLE, |
351 | .core_supply = "lcd_2v8", | ||
352 | .io_supply = "vdd_lcdio", | ||
353 | }; | 351 | }; |
354 | 352 | ||
355 | static struct spi_board_info mx27_3ds_spi_devs[] __initdata = { | 353 | static struct spi_board_info mx27_3ds_spi_devs[] __initdata = { |
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 589066fb3316..6484db525bd7 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c | |||
@@ -285,8 +285,6 @@ static struct mx3fb_platform_data mx3fb_pdata __initdata = { | |||
285 | static struct l4f00242t03_pdata mx31_3ds_l4f00242t03_pdata = { | 285 | static struct l4f00242t03_pdata mx31_3ds_l4f00242t03_pdata = { |
286 | .reset_gpio = IOMUX_TO_GPIO(MX31_PIN_LCS1), | 286 | .reset_gpio = IOMUX_TO_GPIO(MX31_PIN_LCS1), |
287 | .data_enable_gpio = IOMUX_TO_GPIO(MX31_PIN_SER_RS), | 287 | .data_enable_gpio = IOMUX_TO_GPIO(MX31_PIN_SER_RS), |
288 | .core_supply = "lcd_2v8", | ||
289 | .io_supply = "vdd_lcdio", | ||
290 | }; | 288 | }; |
291 | 289 | ||
292 | /* | 290 | /* |
@@ -411,7 +409,7 @@ static struct regulator_init_data vmmc2_init = { | |||
411 | }; | 409 | }; |
412 | 410 | ||
413 | static struct regulator_consumer_supply vmmc1_consumers[] = { | 411 | static struct regulator_consumer_supply vmmc1_consumers[] = { |
414 | REGULATOR_SUPPLY("lcd_2v8", NULL), | 412 | REGULATOR_SUPPLY("vcore", "spi0.0"), |
415 | REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"), | 413 | REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"), |
416 | }; | 414 | }; |
417 | 415 | ||
@@ -428,7 +426,7 @@ static struct regulator_init_data vmmc1_init = { | |||
428 | }; | 426 | }; |
429 | 427 | ||
430 | static struct regulator_consumer_supply vgen_consumers[] = { | 428 | static struct regulator_consumer_supply vgen_consumers[] = { |
431 | REGULATOR_SUPPLY("vdd_lcdio", NULL), | 429 | REGULATOR_SUPPLY("vdd", "spi0.0"), |
432 | }; | 430 | }; |
433 | 431 | ||
434 | static struct regulator_init_data vgen_init = { | 432 | static struct regulator_init_data vgen_init = { |
diff --git a/arch/cris/arch-v10/kernel/kgdb.c b/arch/cris/arch-v10/kernel/kgdb.c index b9f9c8ce2169..b579dd02e098 100644 --- a/arch/cris/arch-v10/kernel/kgdb.c +++ b/arch/cris/arch-v10/kernel/kgdb.c | |||
@@ -694,7 +694,7 @@ mem2hex(char *buf, unsigned char *mem, int count) | |||
694 | /* Valid mem address. */ | 694 | /* Valid mem address. */ |
695 | for (i = 0; i < count; i++) { | 695 | for (i = 0; i < count; i++) { |
696 | ch = *mem++; | 696 | ch = *mem++; |
697 | buf = pack_hex_byte(buf, ch); | 697 | buf = hex_byte_pack(buf, ch); |
698 | } | 698 | } |
699 | } | 699 | } |
700 | 700 | ||
@@ -868,7 +868,7 @@ stub_is_stopped(int sigval) | |||
868 | /* Send trap type (converted to signal) */ | 868 | /* Send trap type (converted to signal) */ |
869 | 869 | ||
870 | *ptr++ = 'T'; | 870 | *ptr++ = 'T'; |
871 | ptr = pack_hex_byte(ptr, sigval); | 871 | ptr = hex_byte_pack(ptr, sigval); |
872 | 872 | ||
873 | /* Send register contents. We probably only need to send the | 873 | /* Send register contents. We probably only need to send the |
874 | * PC, frame pointer and stack pointer here. Other registers will be | 874 | * PC, frame pointer and stack pointer here. Other registers will be |
@@ -881,7 +881,7 @@ stub_is_stopped(int sigval) | |||
881 | status = read_register (regno, ®_cont); | 881 | status = read_register (regno, ®_cont); |
882 | 882 | ||
883 | if (status == SUCCESS) { | 883 | if (status == SUCCESS) { |
884 | ptr = pack_hex_byte(ptr, regno); | 884 | ptr = hex_byte_pack(ptr, regno); |
885 | *ptr++ = ':'; | 885 | *ptr++ = ':'; |
886 | 886 | ||
887 | ptr = mem2hex(ptr, (unsigned char *)®_cont, | 887 | ptr = mem2hex(ptr, (unsigned char *)®_cont, |
diff --git a/arch/cris/arch-v32/kernel/kgdb.c b/arch/cris/arch-v32/kernel/kgdb.c index c0343c3ea7f8..8c1d35cdf00a 100644 --- a/arch/cris/arch-v32/kernel/kgdb.c +++ b/arch/cris/arch-v32/kernel/kgdb.c | |||
@@ -677,7 +677,7 @@ mem2hex(char *buf, unsigned char *mem, int count) | |||
677 | /* Valid mem address. */ | 677 | /* Valid mem address. */ |
678 | for (i = 0; i < count; i++) { | 678 | for (i = 0; i < count; i++) { |
679 | ch = *mem++; | 679 | ch = *mem++; |
680 | buf = pack_hex_byte(buf, ch); | 680 | buf = hex_byte_pack(buf, ch); |
681 | } | 681 | } |
682 | } | 682 | } |
683 | /* Terminate properly. */ | 683 | /* Terminate properly. */ |
@@ -695,7 +695,7 @@ mem2hex_nbo(char *buf, unsigned char *mem, int count) | |||
695 | mem += count - 1; | 695 | mem += count - 1; |
696 | for (i = 0; i < count; i++) { | 696 | for (i = 0; i < count; i++) { |
697 | ch = *mem--; | 697 | ch = *mem--; |
698 | buf = pack_hex_byte(buf, ch); | 698 | buf = hex_byte_pack(buf, ch); |
699 | } | 699 | } |
700 | 700 | ||
701 | /* Terminate properly. */ | 701 | /* Terminate properly. */ |
@@ -880,7 +880,7 @@ stub_is_stopped(int sigval) | |||
880 | /* Send trap type (converted to signal) */ | 880 | /* Send trap type (converted to signal) */ |
881 | 881 | ||
882 | *ptr++ = 'T'; | 882 | *ptr++ = 'T'; |
883 | ptr = pack_hex_byte(ptr, sigval); | 883 | ptr = hex_byte_pack(ptr, sigval); |
884 | 884 | ||
885 | if (((reg.exs & 0xff00) >> 8) == 0xc) { | 885 | if (((reg.exs & 0xff00) >> 8) == 0xc) { |
886 | 886 | ||
@@ -988,26 +988,26 @@ stub_is_stopped(int sigval) | |||
988 | } | 988 | } |
989 | /* Only send PC, frame and stack pointer. */ | 989 | /* Only send PC, frame and stack pointer. */ |
990 | read_register(PC, ®_cont); | 990 | read_register(PC, ®_cont); |
991 | ptr = pack_hex_byte(ptr, PC); | 991 | ptr = hex_byte_pack(ptr, PC); |
992 | *ptr++ = ':'; | 992 | *ptr++ = ':'; |
993 | ptr = mem2hex(ptr, (unsigned char *)®_cont, register_size[PC]); | 993 | ptr = mem2hex(ptr, (unsigned char *)®_cont, register_size[PC]); |
994 | *ptr++ = ';'; | 994 | *ptr++ = ';'; |
995 | 995 | ||
996 | read_register(R8, ®_cont); | 996 | read_register(R8, ®_cont); |
997 | ptr = pack_hex_byte(ptr, R8); | 997 | ptr = hex_byte_pack(ptr, R8); |
998 | *ptr++ = ':'; | 998 | *ptr++ = ':'; |
999 | ptr = mem2hex(ptr, (unsigned char *)®_cont, register_size[R8]); | 999 | ptr = mem2hex(ptr, (unsigned char *)®_cont, register_size[R8]); |
1000 | *ptr++ = ';'; | 1000 | *ptr++ = ';'; |
1001 | 1001 | ||
1002 | read_register(SP, ®_cont); | 1002 | read_register(SP, ®_cont); |
1003 | ptr = pack_hex_byte(ptr, SP); | 1003 | ptr = hex_byte_pack(ptr, SP); |
1004 | *ptr++ = ':'; | 1004 | *ptr++ = ':'; |
1005 | ptr = mem2hex(ptr, (unsigned char *)®_cont, register_size[SP]); | 1005 | ptr = mem2hex(ptr, (unsigned char *)®_cont, register_size[SP]); |
1006 | *ptr++ = ';'; | 1006 | *ptr++ = ';'; |
1007 | 1007 | ||
1008 | /* Send ERP as well; this will save us an entire register fetch in some cases. */ | 1008 | /* Send ERP as well; this will save us an entire register fetch in some cases. */ |
1009 | read_register(ERP, ®_cont); | 1009 | read_register(ERP, ®_cont); |
1010 | ptr = pack_hex_byte(ptr, ERP); | 1010 | ptr = hex_byte_pack(ptr, ERP); |
1011 | *ptr++ = ':'; | 1011 | *ptr++ = ':'; |
1012 | ptr = mem2hex(ptr, (unsigned char *)®_cont, register_size[ERP]); | 1012 | ptr = mem2hex(ptr, (unsigned char *)®_cont, register_size[ERP]); |
1013 | *ptr++ = ';'; | 1013 | *ptr++ = ';'; |
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 | |||
672 | if ((uint32_t)mem&1 && count>=1) { | 672 | if ((uint32_t)mem&1 && count>=1) { |
673 | if (!gdbstub_read_byte(mem,ch)) | 673 | if (!gdbstub_read_byte(mem,ch)) |
674 | return NULL; | 674 | return NULL; |
675 | buf = pack_hex_byte(buf, ch[0]); | 675 | buf = hex_byte_pack(buf, ch[0]); |
676 | mem++; | 676 | mem++; |
677 | count--; | 677 | count--; |
678 | } | 678 | } |
@@ -680,8 +680,8 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa | |||
680 | if ((uint32_t)mem&3 && count>=2) { | 680 | if ((uint32_t)mem&3 && count>=2) { |
681 | if (!gdbstub_read_word(mem,(uint16_t *)ch)) | 681 | if (!gdbstub_read_word(mem,(uint16_t *)ch)) |
682 | return NULL; | 682 | return NULL; |
683 | buf = pack_hex_byte(buf, ch[0]); | 683 | buf = hex_byte_pack(buf, ch[0]); |
684 | buf = pack_hex_byte(buf, ch[1]); | 684 | buf = hex_byte_pack(buf, ch[1]); |
685 | mem += 2; | 685 | mem += 2; |
686 | count -= 2; | 686 | count -= 2; |
687 | } | 687 | } |
@@ -689,10 +689,10 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa | |||
689 | while (count>=4) { | 689 | while (count>=4) { |
690 | if (!gdbstub_read_dword(mem,(uint32_t *)ch)) | 690 | if (!gdbstub_read_dword(mem,(uint32_t *)ch)) |
691 | return NULL; | 691 | return NULL; |
692 | buf = pack_hex_byte(buf, ch[0]); | 692 | buf = hex_byte_pack(buf, ch[0]); |
693 | buf = pack_hex_byte(buf, ch[1]); | 693 | buf = hex_byte_pack(buf, ch[1]); |
694 | buf = pack_hex_byte(buf, ch[2]); | 694 | buf = hex_byte_pack(buf, ch[2]); |
695 | buf = pack_hex_byte(buf, ch[3]); | 695 | buf = hex_byte_pack(buf, ch[3]); |
696 | mem += 4; | 696 | mem += 4; |
697 | count -= 4; | 697 | count -= 4; |
698 | } | 698 | } |
@@ -700,8 +700,8 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa | |||
700 | if (count>=2) { | 700 | if (count>=2) { |
701 | if (!gdbstub_read_word(mem,(uint16_t *)ch)) | 701 | if (!gdbstub_read_word(mem,(uint16_t *)ch)) |
702 | return NULL; | 702 | return NULL; |
703 | buf = pack_hex_byte(buf, ch[0]); | 703 | buf = hex_byte_pack(buf, ch[0]); |
704 | buf = pack_hex_byte(buf, ch[1]); | 704 | buf = hex_byte_pack(buf, ch[1]); |
705 | mem += 2; | 705 | mem += 2; |
706 | count -= 2; | 706 | count -= 2; |
707 | } | 707 | } |
@@ -709,7 +709,7 @@ static unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fa | |||
709 | if (count>=1) { | 709 | if (count>=1) { |
710 | if (!gdbstub_read_byte(mem,ch)) | 710 | if (!gdbstub_read_byte(mem,ch)) |
711 | return NULL; | 711 | return NULL; |
712 | buf = pack_hex_byte(buf, ch[0]); | 712 | buf = hex_byte_pack(buf, ch[0]); |
713 | } | 713 | } |
714 | 714 | ||
715 | *buf = 0; | 715 | *buf = 0; |
@@ -1498,21 +1498,21 @@ void gdbstub(int sigval) | |||
1498 | ptr = mem2hex(title, ptr, sizeof(title) - 1,0); | 1498 | ptr = mem2hex(title, ptr, sizeof(title) - 1,0); |
1499 | 1499 | ||
1500 | hx = hex_asc_hi(brr >> 24); | 1500 | hx = hex_asc_hi(brr >> 24); |
1501 | ptr = pack_hex_byte(ptr, hx); | 1501 | ptr = hex_byte_pack(ptr, hx); |
1502 | hx = hex_asc_lo(brr >> 24); | 1502 | hx = hex_asc_lo(brr >> 24); |
1503 | ptr = pack_hex_byte(ptr, hx); | 1503 | ptr = hex_byte_pack(ptr, hx); |
1504 | hx = hex_asc_hi(brr >> 16); | 1504 | hx = hex_asc_hi(brr >> 16); |
1505 | ptr = pack_hex_byte(ptr, hx); | 1505 | ptr = hex_byte_pack(ptr, hx); |
1506 | hx = hex_asc_lo(brr >> 16); | 1506 | hx = hex_asc_lo(brr >> 16); |
1507 | ptr = pack_hex_byte(ptr, hx); | 1507 | ptr = hex_byte_pack(ptr, hx); |
1508 | hx = hex_asc_hi(brr >> 8); | 1508 | hx = hex_asc_hi(brr >> 8); |
1509 | ptr = pack_hex_byte(ptr, hx); | 1509 | ptr = hex_byte_pack(ptr, hx); |
1510 | hx = hex_asc_lo(brr >> 8); | 1510 | hx = hex_asc_lo(brr >> 8); |
1511 | ptr = pack_hex_byte(ptr, hx); | 1511 | ptr = hex_byte_pack(ptr, hx); |
1512 | hx = hex_asc_hi(brr); | 1512 | hx = hex_asc_hi(brr); |
1513 | ptr = pack_hex_byte(ptr, hx); | 1513 | ptr = hex_byte_pack(ptr, hx); |
1514 | hx = hex_asc_lo(brr); | 1514 | hx = hex_asc_lo(brr); |
1515 | ptr = pack_hex_byte(ptr, hx); | 1515 | ptr = hex_byte_pack(ptr, hx); |
1516 | 1516 | ||
1517 | ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0); | 1517 | ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0); |
1518 | *ptr = 0; | 1518 | *ptr = 0; |
@@ -1526,10 +1526,10 @@ void gdbstub(int sigval) | |||
1526 | 1526 | ||
1527 | /* Send trap type (converted to signal) */ | 1527 | /* Send trap type (converted to signal) */ |
1528 | *ptr++ = 'T'; | 1528 | *ptr++ = 'T'; |
1529 | ptr = pack_hex_byte(ptr, sigval); | 1529 | ptr = hex_byte_pack(ptr, sigval); |
1530 | 1530 | ||
1531 | /* Send Error PC */ | 1531 | /* Send Error PC */ |
1532 | ptr = pack_hex_byte(ptr, GDB_REG_PC); | 1532 | ptr = hex_byte_pack(ptr, GDB_REG_PC); |
1533 | *ptr++ = ':'; | 1533 | *ptr++ = ':'; |
1534 | ptr = mem2hex(&__debug_frame->pc, ptr, 4, 0); | 1534 | ptr = mem2hex(&__debug_frame->pc, ptr, 4, 0); |
1535 | *ptr++ = ';'; | 1535 | *ptr++ = ';'; |
@@ -1537,7 +1537,7 @@ void gdbstub(int sigval) | |||
1537 | /* | 1537 | /* |
1538 | * Send frame pointer | 1538 | * Send frame pointer |
1539 | */ | 1539 | */ |
1540 | ptr = pack_hex_byte(ptr, GDB_REG_FP); | 1540 | ptr = hex_byte_pack(ptr, GDB_REG_FP); |
1541 | *ptr++ = ':'; | 1541 | *ptr++ = ':'; |
1542 | ptr = mem2hex(&__debug_frame->fp, ptr, 4, 0); | 1542 | ptr = mem2hex(&__debug_frame->fp, ptr, 4, 0); |
1543 | *ptr++ = ';'; | 1543 | *ptr++ = ';'; |
@@ -1545,7 +1545,7 @@ void gdbstub(int sigval) | |||
1545 | /* | 1545 | /* |
1546 | * Send stack pointer | 1546 | * Send stack pointer |
1547 | */ | 1547 | */ |
1548 | ptr = pack_hex_byte(ptr, GDB_REG_SP); | 1548 | ptr = hex_byte_pack(ptr, GDB_REG_SP); |
1549 | *ptr++ = ':'; | 1549 | *ptr++ = ':'; |
1550 | ptr = mem2hex(&__debug_frame->sp, ptr, 4, 0); | 1550 | ptr = mem2hex(&__debug_frame->sp, ptr, 4, 0); |
1551 | *ptr++ = ';'; | 1551 | *ptr++ = ';'; |
diff --git a/arch/mn10300/kernel/gdb-stub.c b/arch/mn10300/kernel/gdb-stub.c index 538266b2c9bc..522eb8a9b60d 100644 --- a/arch/mn10300/kernel/gdb-stub.c +++ b/arch/mn10300/kernel/gdb-stub.c | |||
@@ -798,7 +798,7 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault) | |||
798 | if ((u32) mem & 1 && count >= 1) { | 798 | if ((u32) mem & 1 && count >= 1) { |
799 | if (gdbstub_read_byte(mem, ch) != 0) | 799 | if (gdbstub_read_byte(mem, ch) != 0) |
800 | return 0; | 800 | return 0; |
801 | buf = pack_hex_byte(buf, ch[0]); | 801 | buf = hex_byte_pack(buf, ch[0]); |
802 | mem++; | 802 | mem++; |
803 | count--; | 803 | count--; |
804 | } | 804 | } |
@@ -806,8 +806,8 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault) | |||
806 | if ((u32) mem & 3 && count >= 2) { | 806 | if ((u32) mem & 3 && count >= 2) { |
807 | if (gdbstub_read_word(mem, ch) != 0) | 807 | if (gdbstub_read_word(mem, ch) != 0) |
808 | return 0; | 808 | return 0; |
809 | buf = pack_hex_byte(buf, ch[0]); | 809 | buf = hex_byte_pack(buf, ch[0]); |
810 | buf = pack_hex_byte(buf, ch[1]); | 810 | buf = hex_byte_pack(buf, ch[1]); |
811 | mem += 2; | 811 | mem += 2; |
812 | count -= 2; | 812 | count -= 2; |
813 | } | 813 | } |
@@ -815,10 +815,10 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault) | |||
815 | while (count >= 4) { | 815 | while (count >= 4) { |
816 | if (gdbstub_read_dword(mem, ch) != 0) | 816 | if (gdbstub_read_dword(mem, ch) != 0) |
817 | return 0; | 817 | return 0; |
818 | buf = pack_hex_byte(buf, ch[0]); | 818 | buf = hex_byte_pack(buf, ch[0]); |
819 | buf = pack_hex_byte(buf, ch[1]); | 819 | buf = hex_byte_pack(buf, ch[1]); |
820 | buf = pack_hex_byte(buf, ch[2]); | 820 | buf = hex_byte_pack(buf, ch[2]); |
821 | buf = pack_hex_byte(buf, ch[3]); | 821 | buf = hex_byte_pack(buf, ch[3]); |
822 | mem += 4; | 822 | mem += 4; |
823 | count -= 4; | 823 | count -= 4; |
824 | } | 824 | } |
@@ -826,8 +826,8 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault) | |||
826 | if (count >= 2) { | 826 | if (count >= 2) { |
827 | if (gdbstub_read_word(mem, ch) != 0) | 827 | if (gdbstub_read_word(mem, ch) != 0) |
828 | return 0; | 828 | return 0; |
829 | buf = pack_hex_byte(buf, ch[0]); | 829 | buf = hex_byte_pack(buf, ch[0]); |
830 | buf = pack_hex_byte(buf, ch[1]); | 830 | buf = hex_byte_pack(buf, ch[1]); |
831 | mem += 2; | 831 | mem += 2; |
832 | count -= 2; | 832 | count -= 2; |
833 | } | 833 | } |
@@ -835,7 +835,7 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault) | |||
835 | if (count >= 1) { | 835 | if (count >= 1) { |
836 | if (gdbstub_read_byte(mem, ch) != 0) | 836 | if (gdbstub_read_byte(mem, ch) != 0) |
837 | return 0; | 837 | return 0; |
838 | buf = pack_hex_byte(buf, ch[0]); | 838 | buf = hex_byte_pack(buf, ch[0]); |
839 | } | 839 | } |
840 | 840 | ||
841 | *buf = 0; | 841 | *buf = 0; |
@@ -1273,13 +1273,13 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep) | |||
1273 | ptr = mem2hex(title, ptr, sizeof(title) - 1, 0); | 1273 | ptr = mem2hex(title, ptr, sizeof(title) - 1, 0); |
1274 | 1274 | ||
1275 | hx = hex_asc_hi(excep >> 8); | 1275 | hx = hex_asc_hi(excep >> 8); |
1276 | ptr = pack_hex_byte(ptr, hx); | 1276 | ptr = hex_byte_pack(ptr, hx); |
1277 | hx = hex_asc_lo(excep >> 8); | 1277 | hx = hex_asc_lo(excep >> 8); |
1278 | ptr = pack_hex_byte(ptr, hx); | 1278 | ptr = hex_byte_pack(ptr, hx); |
1279 | hx = hex_asc_hi(excep); | 1279 | hx = hex_asc_hi(excep); |
1280 | ptr = pack_hex_byte(ptr, hx); | 1280 | ptr = hex_byte_pack(ptr, hx); |
1281 | hx = hex_asc_lo(excep); | 1281 | hx = hex_asc_lo(excep); |
1282 | ptr = pack_hex_byte(ptr, hx); | 1282 | ptr = hex_byte_pack(ptr, hx); |
1283 | 1283 | ||
1284 | ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0); | 1284 | ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0); |
1285 | *ptr = 0; | 1285 | *ptr = 0; |
@@ -1291,21 +1291,21 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep) | |||
1291 | ptr = mem2hex(tbcberr, ptr, sizeof(tbcberr) - 1, 0); | 1291 | ptr = mem2hex(tbcberr, ptr, sizeof(tbcberr) - 1, 0); |
1292 | 1292 | ||
1293 | hx = hex_asc_hi(bcberr >> 24); | 1293 | hx = hex_asc_hi(bcberr >> 24); |
1294 | ptr = pack_hex_byte(ptr, hx); | 1294 | ptr = hex_byte_pack(ptr, hx); |
1295 | hx = hex_asc_lo(bcberr >> 24); | 1295 | hx = hex_asc_lo(bcberr >> 24); |
1296 | ptr = pack_hex_byte(ptr, hx); | 1296 | ptr = hex_byte_pack(ptr, hx); |
1297 | hx = hex_asc_hi(bcberr >> 16); | 1297 | hx = hex_asc_hi(bcberr >> 16); |
1298 | ptr = pack_hex_byte(ptr, hx); | 1298 | ptr = hex_byte_pack(ptr, hx); |
1299 | hx = hex_asc_lo(bcberr >> 16); | 1299 | hx = hex_asc_lo(bcberr >> 16); |
1300 | ptr = pack_hex_byte(ptr, hx); | 1300 | ptr = hex_byte_pack(ptr, hx); |
1301 | hx = hex_asc_hi(bcberr >> 8); | 1301 | hx = hex_asc_hi(bcberr >> 8); |
1302 | ptr = pack_hex_byte(ptr, hx); | 1302 | ptr = hex_byte_pack(ptr, hx); |
1303 | hx = hex_asc_lo(bcberr >> 8); | 1303 | hx = hex_asc_lo(bcberr >> 8); |
1304 | ptr = pack_hex_byte(ptr, hx); | 1304 | ptr = hex_byte_pack(ptr, hx); |
1305 | hx = hex_asc_hi(bcberr); | 1305 | hx = hex_asc_hi(bcberr); |
1306 | ptr = pack_hex_byte(ptr, hx); | 1306 | ptr = hex_byte_pack(ptr, hx); |
1307 | hx = hex_asc_lo(bcberr); | 1307 | hx = hex_asc_lo(bcberr); |
1308 | ptr = pack_hex_byte(ptr, hx); | 1308 | ptr = hex_byte_pack(ptr, hx); |
1309 | 1309 | ||
1310 | ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0); | 1310 | ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0); |
1311 | *ptr = 0; | 1311 | *ptr = 0; |
@@ -1321,12 +1321,12 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep) | |||
1321 | * Send trap type (converted to signal) | 1321 | * Send trap type (converted to signal) |
1322 | */ | 1322 | */ |
1323 | *ptr++ = 'T'; | 1323 | *ptr++ = 'T'; |
1324 | ptr = pack_hex_byte(ptr, sigval); | 1324 | ptr = hex_byte_pack(ptr, sigval); |
1325 | 1325 | ||
1326 | /* | 1326 | /* |
1327 | * Send Error PC | 1327 | * Send Error PC |
1328 | */ | 1328 | */ |
1329 | ptr = pack_hex_byte(ptr, GDB_REGID_PC); | 1329 | ptr = hex_byte_pack(ptr, GDB_REGID_PC); |
1330 | *ptr++ = ':'; | 1330 | *ptr++ = ':'; |
1331 | ptr = mem2hex(®s->pc, ptr, 4, 0); | 1331 | ptr = mem2hex(®s->pc, ptr, 4, 0); |
1332 | *ptr++ = ';'; | 1332 | *ptr++ = ';'; |
@@ -1334,7 +1334,7 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep) | |||
1334 | /* | 1334 | /* |
1335 | * Send frame pointer | 1335 | * Send frame pointer |
1336 | */ | 1336 | */ |
1337 | ptr = pack_hex_byte(ptr, GDB_REGID_FP); | 1337 | ptr = hex_byte_pack(ptr, GDB_REGID_FP); |
1338 | *ptr++ = ':'; | 1338 | *ptr++ = ':'; |
1339 | ptr = mem2hex(®s->a3, ptr, 4, 0); | 1339 | ptr = mem2hex(®s->a3, ptr, 4, 0); |
1340 | *ptr++ = ';'; | 1340 | *ptr++ = ';'; |
@@ -1343,7 +1343,7 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep) | |||
1343 | * Send stack pointer | 1343 | * Send stack pointer |
1344 | */ | 1344 | */ |
1345 | ssp = (unsigned long) (regs + 1); | 1345 | ssp = (unsigned long) (regs + 1); |
1346 | ptr = pack_hex_byte(ptr, GDB_REGID_SP); | 1346 | ptr = hex_byte_pack(ptr, GDB_REGID_SP); |
1347 | *ptr++ = ':'; | 1347 | *ptr++ = ':'; |
1348 | ptr = mem2hex(&ssp, ptr, 4, 0); | 1348 | ptr = mem2hex(&ssp, ptr, 4, 0); |
1349 | *ptr++ = ';'; | 1349 | *ptr++ = ';'; |
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index fa0d27a400de..559ae1ee6706 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h | |||
@@ -354,3 +354,5 @@ COMPAT_SYS_SPU(clock_adjtime) | |||
354 | SYSCALL_SPU(syncfs) | 354 | SYSCALL_SPU(syncfs) |
355 | COMPAT_SYS_SPU(sendmmsg) | 355 | COMPAT_SYS_SPU(sendmmsg) |
356 | SYSCALL_SPU(setns) | 356 | SYSCALL_SPU(setns) |
357 | COMPAT_SYS(process_vm_readv) | ||
358 | COMPAT_SYS(process_vm_writev) | ||
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h index b8b3f599362b..d3d1b5efd7eb 100644 --- a/arch/powerpc/include/asm/unistd.h +++ b/arch/powerpc/include/asm/unistd.h | |||
@@ -373,10 +373,12 @@ | |||
373 | #define __NR_syncfs 348 | 373 | #define __NR_syncfs 348 |
374 | #define __NR_sendmmsg 349 | 374 | #define __NR_sendmmsg 349 |
375 | #define __NR_setns 350 | 375 | #define __NR_setns 350 |
376 | #define __NR_process_vm_readv 351 | ||
377 | #define __NR_process_vm_writev 352 | ||
376 | 378 | ||
377 | #ifdef __KERNEL__ | 379 | #ifdef __KERNEL__ |
378 | 380 | ||
379 | #define __NR_syscalls 351 | 381 | #define __NR_syscalls 353 |
380 | 382 | ||
381 | #define __NR__exit __NR_exit | 383 | #define __NR__exit __NR_exit |
382 | #define NR_syscalls __NR_syscalls | 384 | #define NR_syscalls __NR_syscalls |
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 54edb207ff3a..a6253ec1b284 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
@@ -850,4 +850,6 @@ ia32_sys_call_table: | |||
850 | .quad sys_syncfs | 850 | .quad sys_syncfs |
851 | .quad compat_sys_sendmmsg /* 345 */ | 851 | .quad compat_sys_sendmmsg /* 345 */ |
852 | .quad sys_setns | 852 | .quad sys_setns |
853 | .quad compat_sys_process_vm_readv | ||
854 | .quad compat_sys_process_vm_writev | ||
853 | ia32_syscall_end: | 855 | ia32_syscall_end: |
diff --git a/arch/x86/include/asm/unistd_32.h b/arch/x86/include/asm/unistd_32.h index 593485b38ab3..599c77d38f33 100644 --- a/arch/x86/include/asm/unistd_32.h +++ b/arch/x86/include/asm/unistd_32.h | |||
@@ -352,10 +352,12 @@ | |||
352 | #define __NR_syncfs 344 | 352 | #define __NR_syncfs 344 |
353 | #define __NR_sendmmsg 345 | 353 | #define __NR_sendmmsg 345 |
354 | #define __NR_setns 346 | 354 | #define __NR_setns 346 |
355 | #define __NR_process_vm_readv 347 | ||
356 | #define __NR_process_vm_writev 348 | ||
355 | 357 | ||
356 | #ifdef __KERNEL__ | 358 | #ifdef __KERNEL__ |
357 | 359 | ||
358 | #define NR_syscalls 347 | 360 | #define NR_syscalls 349 |
359 | 361 | ||
360 | #define __ARCH_WANT_IPC_PARSE_VERSION | 362 | #define __ARCH_WANT_IPC_PARSE_VERSION |
361 | #define __ARCH_WANT_OLD_READDIR | 363 | #define __ARCH_WANT_OLD_READDIR |
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h index 0a6ba337a2eb..0431f193c3f2 100644 --- a/arch/x86/include/asm/unistd_64.h +++ b/arch/x86/include/asm/unistd_64.h | |||
@@ -682,6 +682,10 @@ __SYSCALL(__NR_sendmmsg, sys_sendmmsg) | |||
682 | __SYSCALL(__NR_setns, sys_setns) | 682 | __SYSCALL(__NR_setns, sys_setns) |
683 | #define __NR_getcpu 309 | 683 | #define __NR_getcpu 309 |
684 | __SYSCALL(__NR_getcpu, sys_getcpu) | 684 | __SYSCALL(__NR_getcpu, sys_getcpu) |
685 | #define __NR_process_vm_readv 310 | ||
686 | __SYSCALL(__NR_process_vm_readv, sys_process_vm_readv) | ||
687 | #define __NR_process_vm_writev 311 | ||
688 | __SYSCALL(__NR_process_vm_writev, sys_process_vm_writev) | ||
685 | 689 | ||
686 | #ifndef __NO_STUBS | 690 | #ifndef __NO_STUBS |
687 | #define __ARCH_WANT_OLD_READDIR | 691 | #define __ARCH_WANT_OLD_READDIR |
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S index bc19be332bc9..9a0e31293920 100644 --- a/arch/x86/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S | |||
@@ -346,3 +346,5 @@ ENTRY(sys_call_table) | |||
346 | .long sys_syncfs | 346 | .long sys_syncfs |
347 | .long sys_sendmmsg /* 345 */ | 347 | .long sys_sendmmsg /* 345 */ |
348 | .long sys_setns | 348 | .long sys_setns |
349 | .long sys_process_vm_readv | ||
350 | .long sys_process_vm_writev | ||