Richard Weinberger 8818b6719f um: fix ptrace build error ... Both commits 0a3d763f1a ("ptrace: cleanup arch_ptrace() on um") and 9b05a69e05 ("ptrace: change signature of arch_ptrace()") broke the um build. This patch fixes the issues. 0a3d763f1a introduced the undeclared variable "datavp". The patch seems completely untested. :-( 9b05a69e05 changed arch_ptrace()'s signature but did not update um/include/asm/ptrace-generic.h. Signed-off-by: Richard Weinberger <richard@nod.at> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Jeff Dike <jdike@addtoit.com> Tested-by: Will Newton <will.newton@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2010-11-12 07:55:30 -08:00
..
alpha	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
arm	Merge branch 'rmobile/core' into rmobile-fixes-for-linus	2010-11-08 09:51:41 +09:00
avr32	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
blackfin	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb	2010-10-29 11:49:38 -07:00
cris	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
frv	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
h8300	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
ia64	convert get_sb_pseudo() users	2010-10-29 04:16:33 -04:00
m32r	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
m68k	m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h	2010-11-03 11:30:07 +10:00
m68knommu	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
microblaze	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
mips	Merge git://git.infradead.org/mtd-2.6	2010-10-30 08:31:35 -07:00
mn10300	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
parisc	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
powerpc	KVM: PPC: BookE: Load the lower half of MSR	2010-11-05 14:42:29 -02:00
s390	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2010-10-29 08:49:18 -07:00
score	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
sh	Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/intc-extension' into sh-fixes-for-linus	2010-11-08 09:42:43 +09:00
sparc	Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-30 11:43:26 -07:00
tile	arch/tile: mark "hardwall" device as non-seekable	2010-11-01 15:31:42 -04:00
um	um: fix ptrace build error	2010-11-12 07:55:30 -08:00
x86	KVM: x86: Issue smp_call_function_many with preemption disabled	2010-11-05 14:42:27 -02:00
xtensa	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
.gitignore
Kconfig	jump label: Add work around to i386 gcc asm goto bug	2010-10-29 14:45:29 -04:00