Merge branch 'akpm' (Andrew's incoming)

094803e0 · Linus Torvalds <[email protected]> · 2011-10-31 17:46:07 -07:00

Quoth Andrew:

 - Most of MM.  Still waiting for the poweroc guys to get off their
   butts and review some threaded hugepages patches.

 - alpha

 - vfs bits

 - drivers/misc

 - a few core kerenl tweaks

 - printk() features

 - MAINTAINERS updates

 - backlight merge

 - leds merge

 - various lib/ updates

 - checkpatch updates

* akpm: (127 commits)
  epoll: fix spurious lockdep warnings
  checkpatch: add a --strict check for utf-8 in commit logs
  kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
  llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
  wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
  fat: follow rename pack_hex_byte() to hex_byte_pack()
  security: follow rename pack_hex_byte() to hex_byte_pack()
  kgdb: follow rename pack_hex_byte() to hex_byte_pack()
  lib: rename pack_hex_byte() to hex_byte_pack()
  lib/string.c: fix strim() semantics for strings that have only blanks
  lib/idr.c: fix comment for ida_get_new_above()
  lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
  lib/bitmap.c: quiet sparse noise about address space
  lib/spinlock_debug.c: print owner on spinlock lockup
  lib/kstrtox: common code between kstrto*() and simple_strto*() functions
  drivers/leds/leds-lp5521.c: check if reset is successful
  leds: turn the blink_timer off before starting to blink
  leds: save the delay values after a successful call to blink_set()
  drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
  drivers/leds/leds-lm3530.c: add __devexit_p where needed
  ...

Commit: 094803e0aab3fe75bbf8202a8f4b5280eaade375
Parents: 32087d4e · d8805e63

Merge commit. Changes below are compared with the first parent: 32087d4e.

Changes

194 files changed · +2520 −1356

File	Status	Add	Del	Content
Documentation/kernel-parameters.txt	modified	+8	−0	View file
Documentation/sysctl/kernel.txt	modified	+8	−0	View file
Documentation/trace/postprocess/trace-vmscan-postprocess.pl	modified	+4	−4	View file
MAINTAINERS	modified	+6	−1	View file
arch/alpha/include/asm/unistd.h	modified	+3	−1	View file
arch/alpha/kernel/systbls.S	modified	+2	−0	View file
arch/arm/mach-imx/mach-mx27_3ds.c	modified	+2	−4	View file
arch/arm/mach-imx/mach-mx31_3ds.c	modified	+2	−4	View file
arch/cris/arch-v10/kernel/kgdb.c	modified	+3	−3	View file
arch/cris/arch-v32/kernel/kgdb.c	modified	+7	−7	View file
arch/frv/kernel/gdb-stub.c	modified	+22	−22	View file
arch/mn10300/kernel/gdb-stub.c	modified	+26	−26	View file
arch/powerpc/include/asm/systbl.h	modified	+2	−0	View file
arch/powerpc/include/asm/unistd.h	modified	+3	−1	View file
arch/x86/ia32/ia32entry.S	modified	+2	−0	View file
arch/x86/include/asm/unistd_32.h	modified	+3	−1	View file
arch/x86/include/asm/unistd_64.h	modified	+4	−0	View file
arch/x86/kernel/syscall_table_32.S	modified	+2	−0	View file
drivers/hwmon/hwmon.c	modified	+8	−24	View file
drivers/hwmon/ibmaem.c	modified	+8	−39	View file
drivers/infiniband/core/umem.c	modified	+3	−3	View file
drivers/infiniband/hw/ipath/ipath_user_pages.c	modified	+3	−3	View file
drivers/infiniband/hw/qib/qib_user_pages.c	modified	+2	−2	View file
drivers/isdn/hisax/callc.c	modified	+2	−2	View file
drivers/isdn/hisax/hisax.h	modified	+2	−2	View file
drivers/isdn/hisax/isdnl1.h	modified	+1	−1	View file
drivers/isdn/hisax/isdnl3.c	modified	+1	−1	View file
drivers/isdn/hisax/st5481_d.c	modified	+2	−2	View file
drivers/leds/Kconfig	modified	+12	−0	View file
drivers/leds/Makefile	modified	+1	−0	View file
drivers/leds/led-class.c	modified	+6	−1	View file
drivers/leds/led-triggers.c	modified	+4	−1	View file
drivers/leds/leds-gpio.c	modified	+1	−1	View file
drivers/leds/leds-lm3530.c	modified	+1	−2	View file
drivers/leds/leds-lp5521.c	modified	+21	−3	View file
drivers/leds/leds-renesas-tpu.c	added	+357	−0	View file
drivers/misc/ad525x_dpot-i2c.c	modified	+1	−0	View file
drivers/misc/fsa9480.c	modified	+2	−1	View file
drivers/misc/lis3lv02d/lis3lv02d.c	modified	+220	−169	View file
drivers/misc/lis3lv02d/lis3lv02d.h	modified	+6	−3	View file
drivers/misc/lis3lv02d/lis3lv02d_i2c.c	modified	+20	−25	View file
drivers/misc/lis3lv02d/lis3lv02d_spi.c	modified	+1	−1	View file
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h	modified	+2	−1	View file
drivers/net/wireless/at76c50x-usb.c	modified	+1	−1	View file
drivers/net/wireless/ath/ath.h	modified	+2	−3	View file
drivers/net/wireless/ath/ath5k/debug.h	modified	+2	−2	View file
drivers/net/wireless/ath/ath6kl/debug.h	modified	+2	−2	View file
drivers/net/wireless/b43/b43.h	modified	+4	−8	View file
drivers/net/wireless/b43legacy/b43legacy.h	modified	+8	−8	View file
drivers/platform/x86/hp_accel.c	modified	+6	−4	View file
drivers/staging/iio/trigger.h	modified	+1	−2	View file
drivers/video/backlight/adp8870_bl.c	modified	+0	−2	View file
drivers/video/backlight/generic_bl.c	modified	+2	−2	View file
drivers/video/backlight/l4f00242t03.c	modified	+23	−47	View file
fs/Kconfig	modified	+1	−1	View file
fs/aio.c	modified	+2	−2	View file
fs/buffer.c	modified	+4	−1	View file
fs/compat.c	modified	+4	−3	View file
fs/ecryptfs/ecryptfs_kernel.h	modified	+1	−1	View file
fs/eventpoll.c	modified	+18	−7	View file
fs/exec.c	modified	+0	−4	View file
fs/ext2/ext2.h	modified	+4	−4	View file
fs/ext4/ext4.h	modified	+22	−22	View file
fs/ext4/inode.c	modified	+5	−1	View file
fs/fat/dir.c	modified	+2	−2	View file
fs/fat/fat.h	modified	+4	−5	View file
fs/gfs2/glock.h	modified	+1	−1	View file
fs/hpfs/hpfs_fn.h	modified	+2	−2	View file
fs/logfs/logfs.h	modified	+0	−1	View file
fs/logfs/super.c	modified	+0	−22	View file
fs/nilfs2/nilfs.h	modified	+4	−4	View file
fs/ntfs/debug.h	modified	+9	−6	View file
fs/ocfs2/super.h	modified	+6	−8	View file
fs/partitions/ldm.c	modified	+9	−7	View file
fs/pipe.c	modified	+1	−0	View file
fs/proc/base.c	modified	+0	−13	View file
fs/proc/task_mmu.c	modified	+5	−0	View file
fs/read_write.c	modified	+5	−3	View file
fs/super.c	modified	+1	−1	View file
fs/udf/udfdecl.h	modified	+2	−2	View file
fs/ufs/ufs.h	modified	+6	−3	View file
fs/xfs/xfs_aops.c	modified	+4	−4	View file
fs/xfs/xfs_message.h	modified	+20	−22	View file
include/asm-generic/bug.h	modified	+6	−5	View file
include/asm-generic/dma-mapping-common.h	modified	+12	−2	View file
include/asm-generic/page.h	modified	+2	−2	View file
include/drm/drmP.h	modified	+5	−5	View file
include/linux/audit.h	modified	+5	−6	View file
include/linux/blktrace_api.h	modified	+1	−1	View file
include/linux/compaction.h	modified	+0	−8	View file
include/linux/compat.h	modified	+2	−1	View file
include/linux/device.h	modified	+51	−59	View file
include/linux/dmar.h	modified	+2	−0	View file
include/linux/dynamic_debug.h	modified	+9	−10	View file
include/linux/ext3_fs.h	modified	+8	−8	View file
include/linux/fs.h	modified	+6	−5	View file
include/linux/fscache-cache.h	modified	+4	−4	View file
include/linux/gameport.h	modified	+4	−4	View file
include/linux/huge_mm.h	modified	+5	−0	View file
include/linux/kallsyms.h	modified	+2	−3	View file
include/linux/kdb.h	modified	+3	−6	View file
include/linux/kernel.h	modified	+30	−25	View file
include/linux/kexec.h	modified	+2	−2	View file
include/linux/kmod.h	modified	+2	−2	View file
include/linux/kobject.h	modified	+12	−14	View file
include/linux/kthread.h	modified	+2	−2	View file
include/linux/libata.h	modified	+9	−9	View file
include/linux/lis3lv02d.h	modified	+0	−1	View file
include/linux/llist.h	modified	+1	−1	View file
include/linux/memblock.h	modified	+1	−0	View file
include/linux/memcontrol.h	modified	+2	−1	View file
include/linux/mm.h	modified	+2	−1	View file
include/linux/mm_types.h	modified	+9	−5	View file
include/linux/mmiotrace.h	modified	+2	−6	View file
include/linux/mmzone.h	modified	+13	−0	View file
include/linux/netdevice.h	modified	+17	−17	View file
include/linux/oom.h	modified	+1	−0	View file
include/linux/platform_data/leds-renesas-tpu.h	added	+14	−0	View file
include/linux/printk.h	modified	+6	−6	View file
include/linux/quotaops.h	modified	+1	−1	View file
include/linux/seq_file.h	modified	+1	−2	View file
include/linux/shrinker.h	modified	+1	−0	View file
include/linux/spi/l4f00242t03.h	modified	+0	−2	View file
include/linux/string.h	modified	+1	−0	View file
include/linux/swap.h	modified	+1	−6	View file
include/linux/syscalls.h	modified	+13	−0	View file
include/linux/trace_seq.h	modified	+4	−4	View file
include/linux/vmalloc.h	modified	+1	−0	View file
include/net/bluetooth/bluetooth.h	modified	+1	−1	View file
include/net/netfilter/nf_log.h	modified	+2	−1	View file
include/net/sock.h	modified	+2	−2	View file
include/sound/core.h	modified	+2	−2	View file
include/sound/info.h	modified	+2	−2	View file
include/sound/seq_kernel.h	modified	+2	−2	View file
include/trace/events/vmscan.h	modified	+4	−4	View file
include/xen/hvc-console.h	modified	+2	−2	View file
include/xen/xenbus.h	modified	+6	−6	View file
ipc/mqueue.c	modified	+2	−2	View file
kernel/debug/gdbstub.c	modified	+6	−6	View file
kernel/events/core.c	modified	+3	−3	View file
kernel/exit.c	modified	+0	−2	View file
kernel/fork.c	modified	+1	−9	View file
kernel/printk.c	modified	+7	−3	View file
kernel/stop_machine.c	modified	+22	−0	View file
kernel/sys_ni.c	modified	+4	−0	View file
kernel/sysctl.c	modified	+9	−0	View file
kernel/watchdog.c	modified	+2	−2	View file
lib/Kconfig.debug	modified	+3	−2	View file
lib/bitmap.c	modified	+6	−4	View file
lib/idr.c	modified	+2	−2	View file
lib/kstrtox.c	modified	+53	−22	View file
lib/kstrtox.h	added	+8	−0	View file
lib/percpu_counter.c	modified	+2	−0	View file
lib/radix-tree.c	modified	+2	−8	View file
lib/spinlock_debug.c	modified	+10	−9	View file
lib/string.c	modified	+55	−2	View file
lib/vsprintf.c	modified	+14	−33	View file
mm/Kconfig	modified	+3	−0	View file
mm/Makefile	modified	+2	−1	View file
mm/backing-dev.c	modified	+2	−3	View file
mm/compaction.c	modified	+11	−15	View file
mm/debug-pagealloc.c	modified	+16	−40	View file
mm/highmem.c	modified	+1	−1	View file
mm/huge_memory.c	modified	+51	−3	View file
mm/ksm.c	modified	+2	−1	View file
mm/memblock.c	modified	+9	−2	View file
mm/memcontrol.c	modified	+2	−1	View file
mm/memory-failure.c	modified	+6	−6	View file
mm/mempolicy.c	modified	+1	−1	View file
mm/migrate.c	modified	+40	−35	View file
mm/mlock.c	modified	+11	−2	View file
mm/mmap.c	modified	+3	−6	View file
mm/mremap.c	modified	+30	−12	View file
mm/oom_kill.c	modified	+32	−21	View file
mm/page-writeback.c	modified	+3	−1	View file
mm/page_alloc.c	modified	+12	−5	View file
mm/process_vm_access.c	added	+496	−0	View file
mm/rmap.c	modified	+1	−1	View file
mm/shmem.c	modified	+6	−0	View file
mm/slub.c	modified	+2	−45	View file
mm/swapfile.c	modified	+1	−1	View file
mm/thrash.c	modified	+1	−1	View file
mm/vmalloc.c	modified	+58	−22	View file
mm/vmscan.c	modified	+177	−148	View file
mm/vmstat.c	modified	+2	−1	View file
net/nfc/nfc.h	modified	+1	−1	View file
net/rds/rds.h	modified	+4	−4	View file
net/sunrpc/svc.c	modified	+2	−3	View file
scripts/checkpatch.pl	modified	+29	−7	View file
security/keys/compat.c	modified	+1	−1	View file
security/keys/encrypted-keys/encrypted.c	modified	+1	−1	View file
security/keys/keyctl.c	modified	+1	−1	View file
security/keys/trusted.c	modified	+1	−1	View file
sound/firewire/cmp.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 661efd4..a0c5c5f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -973,6 +973,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 	ignore_loglevel	[KNL]
 			Ignore loglevel setting - this will print /all/
 			kernel messages to the console. Useful for debugging.
+			We also add it as printk module parameter, so users
+			could change it dynamically, usually by
+			/sys/module/printk/parameters/ignore_loglevel.
 
 	ihash_entries=	[KNL]
 			Set number of hash buckets for inode cache.
@@ -1666,6 +1669,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			debugging driver suspend/resume hooks).  This may
 			not work reliably with all consoles, but is known
 			to work with serial and VGA consoles.
+			To facilitate more flexible debugging, we also add
+			console_suspend, a printk module parameter to control
+			it. Users could use console_suspend (usually
+			/sys/module/printk/parameters/console_suspend) to
+			turn on/off it dynamically.
 
 	noaliencache	[MM, NUMA, SLAB] Disables the allocation of alien
 			caches in the slab allocator.  Saves per-node memory,

Documentation/sysctl/kernel.txt

View file

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 704e474..1f24636 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -24,6 +24,7 @@ show up in /proc/sys/kernel:
 - bootloader_type	     [ X86 only ]
 - bootloader_version	     [ X86 only ]
 - callhome		     [ S390 only ]
+- cap_last_cap
 - core_pattern
 - core_pipe_limit
 - core_uses_pid
@@ -155,6 +156,13 @@ on has a service contract with IBM.
 
 ==============================================================
 
+cap_last_cap
+
+Highest valid capability of the running kernel.  Exports
+CAP_LAST_CAP from the kernel.
+
+==============================================================
+
 core_pattern:
 
 core_pattern is used to specify a core dumpfile pattern name.

Documentation/trace/postprocess/trace-vmscan-postprocess.pl

View file

diff --git a/Documentation/trace/postprocess/trace-vmscan-postprocess.pl b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
index 12cecc8..4a37c47 100644
--- a/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
+++ b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
@@ -379,10 +379,10 @@ EVENT_PROCESS:
 
 			# To closer match vmstat scanning statistics, only count isolate_both
 			# and isolate_inactive as scanning. isolate_active is rotation
-			# isolate_inactive == 0
-			# isolate_active   == 1
-			# isolate_both     == 2
-			if ($isolate_mode != 1) {
+			# isolate_inactive == 1
+			# isolate_active   == 2
+			# isolate_both     == 3
+			if ($isolate_mode != 2) {
 				$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;
 			}
 			$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index d498c70..4befa12 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -316,6 +316,10 @@ W:	http://wiki.analog.com/AD7879
 S:	Supported
 F:	drivers/input/touchscreen/ad7879.c
 
+ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
+M:	Jiri Kosina <[email protected]>
+S:	Maintained
+
 ADM1025 HARDWARE MONITOR DRIVER
 M:	Jean Delvare <[email protected]>
 L:	[email protected]
@@ -4020,6 +4024,7 @@ M:	Eric Piel <[email protected]>
 S:	Maintained
 F:	Documentation/misc-devices/lis3lv02d
 F:	drivers/misc/lis3lv02d/
+F:	drivers/platform/x86/hp_accel.c
 
 LLC (802.2)
 M:	Arnaldo Carvalho de Melo <[email protected]>
@@ -4974,7 +4979,7 @@ F:	include/linux/i2c-algo-pca.h
 F:	include/linux/i2c-pca-platform.h
 
 PCI ERROR RECOVERY
-M:	Linas Vepstas <[email protected]>
+M:     Linas Vepstas <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	Documentation/PCI/pci-error-recovery.txt

arch/alpha/include/asm/unistd.h

View file

diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index 4ac48a0..2207fc6 100644
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -457,10 +457,12 @@
 #define __NR_clock_adjtime		499
 #define __NR_syncfs			500
 #define __NR_setns			501
+#define __NR_accept4			502
+#define __NR_sendmmsg			503
 
 #ifdef __KERNEL__
 
-#define NR_SYSCALLS			502
+#define NR_SYSCALLS			504
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR

arch/alpha/kernel/systbls.S

View file

diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S
index 6acea1f..e534e1c 100644
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@ -520,6 +520,8 @@ sys_call_table:
 	.quad sys_clock_adjtime
 	.quad sys_syncfs			/* 500 */
 	.quad sys_setns
+	.quad sys_accept4
+	.quad sys_sendmmsg
 
 	.size sys_call_table, . - sys_call_table
 	.type sys_call_table, @object

arch/arm/mach-imx/mach-mx27_3ds.c

View file

diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index 2eafbac..3772304 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 = {
 };
 
 static struct regulator_consumer_supply vmmc1_consumers[] = {
-	REGULATOR_SUPPLY("lcd_2v8", NULL),
+	REGULATOR_SUPPLY("vcore", "spi0.0"),
 };
 
 static struct regulator_init_data vmmc1_init = {
@@ -257,7 +257,7 @@ static struct regulator_init_data vmmc1_init = {
 };
 
 static struct regulator_consumer_supply vgen_consumers[] = {
-	REGULATOR_SUPPLY("vdd_lcdio", NULL),
+	REGULATOR_SUPPLY("vdd", "spi0.0"),
 };
 
 static struct regulator_init_data vgen_init = {
@@ -348,8 +348,6 @@ static const struct imx_fb_platform_data mx27_3ds_fb_data __initconst = {
 static struct l4f00242t03_pdata mx27_3ds_lcd_pdata = {
 	.reset_gpio		= LCD_RESET,
 	.data_enable_gpio	= LCD_ENABLE,
-	.core_supply		= "lcd_2v8",
-	.io_supply		= "vdd_lcdio",
 };
 
 static struct spi_board_info mx27_3ds_spi_devs[] __initdata = {

arch/arm/mach-imx/mach-mx31_3ds.c

View file

diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 589066f..6484db5 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 = {
 static struct l4f00242t03_pdata mx31_3ds_l4f00242t03_pdata = {
 	.reset_gpio		= IOMUX_TO_GPIO(MX31_PIN_LCS1),
 	.data_enable_gpio	= IOMUX_TO_GPIO(MX31_PIN_SER_RS),
-	.core_supply		= "lcd_2v8",
-	.io_supply		= "vdd_lcdio",
 };
 
 /*
@@ -411,7 +409,7 @@ static struct regulator_init_data vmmc2_init = {
 };
 
 static struct regulator_consumer_supply vmmc1_consumers[] = {
-	REGULATOR_SUPPLY("lcd_2v8", NULL),
+	REGULATOR_SUPPLY("vcore", "spi0.0"),
 	REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"),
 };
 
@@ -428,7 +426,7 @@ static struct regulator_init_data vmmc1_init = {
 };
 
 static struct regulator_consumer_supply vgen_consumers[] = {
-	REGULATOR_SUPPLY("vdd_lcdio", NULL),
+	REGULATOR_SUPPLY("vdd", "spi0.0"),
 };
 
 static struct regulator_init_data vgen_init = {

arch/cris/arch-v10/kernel/kgdb.c

View file

diff --git a/arch/cris/arch-v10/kernel/kgdb.c b/arch/cris/arch-v10/kernel/kgdb.c
index b9f9c8c..b579dd0 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)
                 /* Valid mem address. */
                 for (i = 0; i < count; i++) {
                         ch = *mem++;
-			buf = pack_hex_byte(buf, ch);
+			buf = hex_byte_pack(buf, ch);
                 }
         }
         
@@ -868,7 +868,7 @@ stub_is_stopped(int sigval)
 	/* Send trap type (converted to signal) */
 
 	*ptr++ = 'T';
-	ptr = pack_hex_byte(ptr, sigval);
+	ptr = hex_byte_pack(ptr, sigval);
 
 	/* Send register contents. We probably only need to send the
 	 * PC, frame pointer and stack pointer here. Other registers will be
@@ -881,7 +881,7 @@ stub_is_stopped(int sigval)
                 status = read_register (regno, &reg_cont);
                 
 		if (status == SUCCESS) {
-			ptr = pack_hex_byte(ptr, regno);
+			ptr = hex_byte_pack(ptr, regno);
                         *ptr++ = ':';
 
                         ptr = mem2hex(ptr, (unsigned char *)&reg_cont,

arch/cris/arch-v32/kernel/kgdb.c

View file

diff --git a/arch/cris/arch-v32/kernel/kgdb.c b/arch/cris/arch-v32/kernel/kgdb.c
index c0343c3..8c1d35c 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)
                 /* Valid mem address. */
 		for (i = 0; i < count; i++) {
 			ch = *mem++;
-			buf = pack_hex_byte(buf, ch);
+			buf = hex_byte_pack(buf, ch);
 		}
         }
         /* Terminate properly. */
@@ -695,7 +695,7 @@ mem2hex_nbo(char *buf, unsigned char *mem, int count)
 	mem += count - 1;
 	for (i = 0; i < count; i++) {
 		ch = *mem--;
-		buf = pack_hex_byte(buf, ch);
+		buf = hex_byte_pack(buf, ch);
         }
 
         /* Terminate properly. */
@@ -880,7 +880,7 @@ stub_is_stopped(int sigval)
 	/* Send trap type (converted to signal) */
 
 	*ptr++ = 'T';
-	ptr = pack_hex_byte(ptr, sigval);
+	ptr = hex_byte_pack(ptr, sigval);
 
 	if (((reg.exs & 0xff00) >> 8) == 0xc) {
 
@@ -988,26 +988,26 @@ stub_is_stopped(int sigval)
 	}
 	/* Only send PC, frame and stack pointer. */
 	read_register(PC, &reg_cont);
-	ptr = pack_hex_byte(ptr, PC);
+	ptr = hex_byte_pack(ptr, PC);
 	*ptr++ = ':';
 	ptr = mem2hex(ptr, (unsigned char *)&reg_cont, register_size[PC]);
 	*ptr++ = ';';
 
 	read_register(R8, &reg_cont);
-	ptr = pack_hex_byte(ptr, R8);
+	ptr = hex_byte_pack(ptr, R8);
 	*ptr++ = ':';
 	ptr = mem2hex(ptr, (unsigned char *)&reg_cont, register_size[R8]);
 	*ptr++ = ';';
 
 	read_register(SP, &reg_cont);
-	ptr = pack_hex_byte(ptr, SP);
+	ptr = hex_byte_pack(ptr, SP);
 	*ptr++ = ':';
 	ptr = mem2hex(ptr, (unsigned char *)&reg_cont, register_size[SP]);
 	*ptr++ = ';';
 
 	/* Send ERP as well; this will save us an entire register fetch in some cases. */
         read_register(ERP, &reg_cont);
-	ptr = pack_hex_byte(ptr, ERP);
+	ptr = hex_byte_pack(ptr, ERP);
         *ptr++ = ':';
         ptr = mem2hex(ptr, (unsigned char *)&reg_cont, register_size[ERP]);
         *ptr++ = ';';

arch/frv/kernel/gdb-stub.c

View file

diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c
index a4dba6b..a6d5381 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++ = ';';

arch/mn10300/kernel/gdb-stub.c

View file

diff --git a/arch/mn10300/kernel/gdb-stub.c b/arch/mn10300/kernel/gdb-stub.c
index 538266b..522eb8a 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)
 	if ((u32) mem & 1 && count >= 1) {
 		if (gdbstub_read_byte(mem, ch) != 0)
 			return 0;
-		buf = pack_hex_byte(buf, ch[0]);
+		buf = hex_byte_pack(buf, ch[0]);
 		mem++;
 		count--;
 	}
@@ -806,8 +806,8 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
 	if ((u32) mem & 3 && count >= 2) {
 		if (gdbstub_read_word(mem, ch) != 0)
 			return 0;
-		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;
 	}
@@ -815,10 +815,10 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
 	while (count >= 4) {
 		if (gdbstub_read_dword(mem, ch) != 0)
 			return 0;
-		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;
 	}
@@ -826,8 +826,8 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
 	if (count >= 2) {
 		if (gdbstub_read_word(mem, ch) != 0)
 			return 0;
-		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;
 	}
@@ -835,7 +835,7 @@ unsigned char *mem2hex(const void *_mem, char *buf, int count, int may_fault)
 	if (count >= 1) {
 		if (gdbstub_read_byte(mem, ch) != 0)
 			return 0;
-		buf = pack_hex_byte(buf, ch[0]);
+		buf = hex_byte_pack(buf, ch[0]);
 	}
 
 	*buf = 0;
@@ -1273,13 +1273,13 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
 		ptr = mem2hex(title, ptr, sizeof(title) - 1, 0);
 
 		hx = hex_asc_hi(excep >> 8);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_lo(excep >> 8);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_hi(excep);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_lo(excep);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 
 		ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0);
 		*ptr = 0;
@@ -1291,21 +1291,21 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
 		ptr = mem2hex(tbcberr, ptr, sizeof(tbcberr) - 1, 0);
 
 		hx = hex_asc_hi(bcberr >> 24);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_lo(bcberr >> 24);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_hi(bcberr >> 16);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_lo(bcberr >> 16);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_hi(bcberr >> 8);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_lo(bcberr >> 8);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_hi(bcberr);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 		hx = hex_asc_lo(bcberr);
-		ptr = pack_hex_byte(ptr, hx);
+		ptr = hex_byte_pack(ptr, hx);
 
 		ptr = mem2hex(crlf, ptr, sizeof(crlf) - 1, 0);
 		*ptr = 0;
@@ -1321,12 +1321,12 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
 	 * 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_REGID_PC);
+	ptr = hex_byte_pack(ptr, GDB_REGID_PC);
 	*ptr++ = ':';
 	ptr = mem2hex(&regs->pc, ptr, 4, 0);
 	*ptr++ = ';';
@@ -1334,7 +1334,7 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
 	/*
 	 * Send frame pointer
 	 */
-	ptr = pack_hex_byte(ptr, GDB_REGID_FP);
+	ptr = hex_byte_pack(ptr, GDB_REGID_FP);
 	*ptr++ = ':';
 	ptr = mem2hex(&regs->a3, ptr, 4, 0);
 	*ptr++ = ';';
@@ -1343,7 +1343,7 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
 	 * Send stack pointer
 	 */
 	ssp = (unsigned long) (regs + 1);
-	ptr = pack_hex_byte(ptr, GDB_REGID_SP);
+	ptr = hex_byte_pack(ptr, GDB_REGID_SP);
 	*ptr++ = ':';
 	ptr = mem2hex(&ssp, ptr, 4, 0);
 	*ptr++ = ';';

arch/powerpc/include/asm/systbl.h

View file

diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index fa0d27a..559ae1e 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -354,3 +354,5 @@ COMPAT_SYS_SPU(clock_adjtime)
 SYSCALL_SPU(syncfs)
 COMPAT_SYS_SPU(sendmmsg)
 SYSCALL_SPU(setns)
+COMPAT_SYS(process_vm_readv)
+COMPAT_SYS(process_vm_writev)

arch/powerpc/include/asm/unistd.h

View file

diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index b8b3f59..d3d1b5e 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -373,10 +373,12 @@
 #define __NR_syncfs		348
 #define __NR_sendmmsg		349
 #define __NR_setns		350
+#define __NR_process_vm_readv	351
+#define __NR_process_vm_writev	352
 
 #ifdef __KERNEL__
 
-#define __NR_syscalls		351
+#define __NR_syscalls		353
 
 #define __NR__exit __NR_exit
 #define NR_syscalls	__NR_syscalls

arch/x86/ia32/ia32entry.S

View file

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 54edb20..a6253ec 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -850,4 +850,6 @@ ia32_sys_call_table:
 	.quad sys_syncfs
 	.quad compat_sys_sendmmsg	/* 345 */
 	.quad sys_setns
+	.quad compat_sys_process_vm_readv
+	.quad compat_sys_process_vm_writev
 ia32_syscall_end:

arch/x86/include/asm/unistd_32.h

View file

diff --git a/arch/x86/include/asm/unistd_32.h b/arch/x86/include/asm/unistd_32.h
index 593485b..599c77d 100644
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@ -352,10 +352,12 @@
 #define __NR_syncfs             344
 #define __NR_sendmmsg		345
 #define __NR_setns		346
+#define __NR_process_vm_readv	347
+#define __NR_process_vm_writev	348
 
 #ifdef __KERNEL__

This diff is incomplete. Download the complete patch.