]>
git.apps.os.sepia.ceph.com Git - ceph-client.git/log 
Jonathan Neuschäfer  [Fri, 12 Aug 2011 00:28:23 +0000  (02:28  +0200)] 
UserModeLinux-HOWTO.txt: remove ^H charactersSigned-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Signed-off-by: Richard Weinberger <richard@nod.at> 
Richard Weinberger  [Thu, 18 Aug 2011 19:58:07 +0000  (21:58 +0200)] 
um: we need sys/user.h only on i386Signed-off-by: Richard Weinberger <richard@nod.at> 
Richard Weinberger  [Thu, 18 Aug 2011 19:55:11 +0000  (21:55 +0200)] 
um: merge delay_{32,64}.cSigned-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:14:10 +0000  (20:14 +0100)] 
um: distribute exports to where exported stuff is definedSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:14:00 +0000  (20:14 +0100)] 
um: kill system-um.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:13:50 +0000  (20:13 +0100)] 
um: generic ftrace.h will do...Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:13:40 +0000  (20:13 +0100)] 
um: segment.h is x86-only and needed only thereSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:13:30 +0000  (20:13 +0100)] 
um: asm/pda.h is not needed anymoreSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:13:20 +0000  (20:13 +0100)] 
um: hw_irq.h can go generic as wellSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:13:10 +0000  (20:13 +0100)] 
um: switch to generic-ySigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:13:00 +0000  (20:13 +0100)] 
um: clean Kconfig up a bitSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:12:50 +0000  (20:12 +0100)] 
um: a couple of missing dependencies...Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:12:39 +0000  (20:12 +0100)] 
um: kill useless argument of free_chan() and free_one_chan()Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:12:19 +0000  (20:12 +0100)] 
um: unify ptrace_user.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:12:09 +0000  (20:12 +0100)] 
um: unify KSTK_...Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:11:49 +0000  (20:11 +0100)] 
um: fix gcov build breakageSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:11:39 +0000  (20:11 +0100)] 
um: page_offset.h is never usedSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:11:29 +0000  (20:11 +0100)] 
um: irq_vectors.h just shadows x86 oneSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:11:19 +0000  (20:11 +0100)] 
um: required-features.h is there only to shadow x86 one...Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:11:09 +0000  (20:11 +0100)] 
um: asm/apic.h is there only to shadow the x86 one...Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:10:59 +0000  (20:10 +0100)] 
um: take ubd_user.h to its users...Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:10:49 +0000  (20:10 +0100)] 
um: take ldt.h to arch/x86/um/asm/mm_context.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:10:39 +0000  (20:10 +0100)] 
um: merge signal_{32,64}.cSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:10:29 +0000  (20:10 +0100)] 
um: no need to play with save_sp in signal frame setup anymoreSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:10:19 +0000  (20:10 +0100)] 
um: increase stack growth cushion in pagefaultSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:10:09 +0000  (20:10 +0100)] 
um: merge HOST_... of registers common on i386 and amd64Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:09:59 +0000  (20:09 +0100)] 
um: sanitize paths in sys_call_table* includesSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:09:49 +0000  (20:09 +0100)] 
um: merge os-Linux/tls.c into arch/x86/um/os-Linux/tls.cSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:09:39 +0000  (20:09 +0100)] 
um: move asm/desc.h into arch/x86/um/asmSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:09:29 +0000  (20:09 +0100)] 
um: merge host_ldt_{32,64}.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:09:19 +0000  (20:09 +0100)] 
um: merge tls_{32,64}.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:09:09 +0000  (20:09 +0100)] 
um: take um_mmu.h to asm/mmu.h, clean asm/mmu_context.h a bitSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:08:59 +0000  (20:08 +0100)] 
um: kill useless include of user.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:08:49 +0000  (20:08 +0100)] 
um: kill um_uaccess.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:08:39 +0000  (20:08 +0100)] 
um: take mconsole*.h to arch/um/driversSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:08:29 +0000  (20:08 +0100)] 
um: take chan_*.h and line.h to arch/um/driversSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:08:19 +0000  (20:08 +0100)] 
um: take register_winch_irq() into the caller of is_skas_winch()Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:08:09 +0000  (20:08 +0100)] 
um: kill shared/mem_kern.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:07:59 +0000  (20:07 +0100)] 
um: kill shared/tlb.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:07:49 +0000  (20:07 +0100)] 
um: make flush_tlb_kernel_range_common() staticSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:07:39 +0000  (20:07 +0100)] 
um: kill shared/task.h and HOST_TASK_REGSSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:07:29 +0000  (20:07 +0100)] 
um: shared/syscall.h is not even includedSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:07:19 +0000  (20:07 +0100)] 
um: don't include kern.h unless it's neededSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:07:09 +0000  (20:07 +0100)] 
um: trim kern.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:06:59 +0000  (20:06 +0100)] 
um: make load_initrd() static, kill shared/initrd.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:06:49 +0000  (20:06 +0100)] 
um: bury unused macros around ptrace.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:06:39 +0000  (20:06 +0100)] 
um: take arch/um/sys-x86 to arch/x86/umSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:06:29 +0000  (20:06 +0100)] 
um: merge Makefile-{i386,x86_64}Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:06:19 +0000  (20:06 +0100)] 
um: trim detritus from Makefile-i386Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:06:09 +0000  (20:06 +0100)] 
um: arch_hweight.h is needed only on uml-x86Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:05:59 +0000  (20:05 +0100)] 
um: merge kernel_offsets_*.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:05:49 +0000  (20:05 +0100)] 
um: merge skas_ptrace.h 32/64bit variantsSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:05:39 +0000  (20:05 +0100)] 
um: sysdep/barrier.h is not used for anythingSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:05:29 +0000  (20:05 +0100)] 
um: shared/process.h is empty now; kill itSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:05:19 +0000  (20:05 +0100)] 
um: finish conversion to mcontext_tSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:05:09 +0000  (20:05 +0100)] 
um: start switching the references to host mcontext_t to its userland typeSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:04:59 +0000  (20:04 +0100)] 
um: take userland definition of barrier() to user.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:04:49 +0000  (20:04 +0100)] 
um: take system.h out of shared/sysdepSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:04:39 +0000  (20:04 +0100)] 
um: fill the handlers array at build timeSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:04:29 +0000  (20:04 +0100)] 
um: simplify set_handler()Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:04:19 +0000  (20:04 +0100)] 
um: don't bother blocking SIGARLM and SIGUSR1Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:04:09 +0000  (20:04 +0100)] 
um: switch stub_segv_handler to SA_SIGINFO variant, get rid of magic crap in thereSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:03:59 +0000  (20:03 +0100)] 
um: kill includes of sysdep/sigcontext.h from stuff built with kernel headersSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:03:49 +0000  (20:03 +0100)] 
um: merge arch/um/os-Linux/sys-{i386,x86_64}Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:03:39 +0000  (20:03 +0100)] 
um: merge hard_handler() instances, switch to use of SA_SIGINFOSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:03:29 +0000  (20:03 +0100)] 
um: kill dead code around uaccessSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:03:19 +0000  (20:03 +0100)] 
um: merge arch/um/sys-{i386,x86_64}Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:03:09 +0000  (20:03 +0100)] 
um: merge arch/um/sys-{i386,x86_64}/sharedSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:02:59 +0000  (20:02 +0100)] 
um: merge arch/um/sys-{i386,x86_64}/asmSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:02:49 +0000  (20:02 +0100)] 
um: get rid of unused macros in ptrace_user.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:02:39 +0000  (20:02 +0100)] 
um: get rid of sysdep/sc.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:02:29 +0000  (20:02 +0100)] 
um: Get rid of UPT_SET/UPT_REG macrosSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:02:19 +0000  (20:02 +0100)] 
um: take vm-flags.h to sys-*/asmSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:02:09 +0000  (20:02 +0100)] 
um: get rid of sysdep/checksum.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:01:59 +0000  (20:01 +0100)] 
um: trim unused junk from user.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:01:49 +0000  (20:01 +0100)] 
um: get rid of kern_constants.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:01:39 +0000  (20:01 +0100)] 
um: kill a couple of useless includes of kern_constants.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:01:29 +0000  (20:01 +0100)] 
um: -include user.h for USER_OBJ, trim includesSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:01:19 +0000  (20:01 +0100)] 
um: take user_constants.h to include/generatedSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:01:09 +0000  (20:01 +0100)] 
um: kill skas_ptregs.hSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:00:59 +0000  (20:00 +0100)] 
um: switch to -idirafter, get saner kern_constants.h out of thatSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:00:49 +0000  (20:00 +0100)] 
um: series of __get_user() is costly in sigframe handlingSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:00:39 +0000  (20:00 +0100)] 
um: make copy_sc() staticSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:00:29 +0000  (20:00 +0100)] 
um: don't rely on sc.fpstate not having been reassigned prior to rt_sigreturn()Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:00:19 +0000  (20:00 +0100)] 
um: switch {rt_,}sigreturn() to set_current_blocked()Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Al Viro  [Thu, 18 Aug 2011 19:00:09 +0000  (20:00 +0100)] 
um: use subarch-obj instead of copying...Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Linus Torvalds  [Mon, 24 Oct 2011 07:10:05 +0000  (09:10 +0200)] 
Linux 3.1
Linus Torvalds  [Mon, 24 Oct 2011 05:08:24 +0000  (07:08 +0200)] 
Merge git://git.infradead.org/iommu-2.6
Linus Torvalds  [Mon, 24 Oct 2011 05:05:38 +0000  (07:05 +0200)] 
Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm
Takashi Iwai  [Sun, 23 Oct 2011 21:19:12 +0000  (23:19 +0200)] 
x86: Fix S4 regression
Commit 
4b239f458  ("x86-64, mm: Put early page table high") causes a S4
regression since 2.6.39, namely the machine reboots occasionally at S4
resume.  It doesn't happen always, overall rate is about 1/20.  But,
like other bugs, once when this happens, it continues to happen.
This patch fixes the problem by essentially reverting the memory
assignment in the older way.
Signed-off-by: Takashi Iwai <tiwai@suse.de> 
Cc: <stable@kernel.org> 
Cc: Rafael J. Wysocki <rjw@sisk.pl> 
Cc: Yinghai Lu <yinghai.lu@oracle.com> 
[ We'll hopefully find the real fix, but that's too late for 3.1 now ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 
Alasdair G Kergon  [Sun, 23 Oct 2011 19:55:17 +0000  (20:55 +0100)] 
dm kcopyd: fix job_pool leak
Fix memory leak introduced by commit 
a6e50b409d3f9e0833e69c3c9cca822e8fa4adbb 
(dm snapshot: skip reading origin when overwriting complete chunk).
When allocating a set of jobs from kc->job_pool, job->master_job must be
set (to point to itself) so that the mempool item gets freed when the
master_job completes.
master_job was introduced by commit 
c6ea41fbbe08f270a8edef99dc369faf809d1bd6 
(dm kcopyd: preallocate sub jobs to avoid deadlock)
Reported-by: Michael Leun <ml@newton.leun.net> 
Cc: Mikulas Patocka <mpatocka@redhat.com> 
Signed-off-by: Alasdair G Kergon <agk@redhat.com> 
Linus Torvalds  [Sun, 23 Oct 2011 07:44:40 +0000  (10:44 +0300)] 
Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung
Linus Torvalds  [Sun, 23 Oct 2011 07:43:31 +0000  (10:43 +0300)] 
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Domenico Andreoli  [Fri, 21 Oct 2011 19:00:53 +0000  (04:00  +0900)] 
ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PMSigned-off-by: Domenico Andreoli <cavokz@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> 
Linus Torvalds  [Fri, 21 Oct 2011 14:02:18 +0000  (17:02 +0300)] 
Merge git://github.com/herbertx/crypto
Linus Torvalds  [Fri, 21 Oct 2011 14:01:21 +0000  (17:01 +0300)] 
Merge branch 'fix/hda' of git://github.com/tiwai/sound
Nick Bowler  [Thu, 20 Oct 2011 12:16:55 +0000  (14:16 +0200)] 
crypto: ghash - Avoid null pointer dereference if no key is set
The ghash_update function passes a pointer to gf128mul_4k_lle which will
be NULL if ghash_setkey is not called or if the most recent call to
ghash_setkey failed to allocate memory.  This causes an oops.  Fix this
up by returning an error code in the null case.
This is trivially triggered from unprivileged userspace through the
AF_ALG interface by simply writing to the socket without setting a key.
The ghash_final function has a similar issue, but triggering it requires
a memory allocation failure in ghash_setkey _after_ at least one
successful call to ghash_update.
  BUG: unable to handle kernel NULL pointer dereference at 
00000670 
  IP: [<
d88c92d4 >] gf128mul_4k_lle+0x23/0x60 [gf128mul]
  *pde = 
00000000 
  Oops: 0000 [#1] PREEMPT SMP
  Modules linked in: ghash_generic gf128mul algif_hash af_alg nfs lockd nfs_acl sunrpc bridge ipv6 stp llc
  Pid: 1502, comm: hashatron Tainted: G        W   
3.1.0-rc9-00085-ge9308cf  #32 Bochs Bochs
  EIP: 0060:[<
d88c92d4 >] EFLAGS: 
00000202  CPU: 0
  EIP is at gf128mul_4k_lle+0x23/0x60 [gf128mul]
  EAX: 
d69db1f0  EBX: 
d6b8ddac  ECX: 
00000004  EDX: 
00000000 
  ESI: 
00000670  EDI: 
d6b8ddac  EBP: 
d6b8ddc8  ESP: 
d6b8dda4 
   DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
  Process hashatron (pid: 1502, ti=
d6b8c000  task=
d6810000  task.ti=
d6b8c000 )
  Stack:
   
00000000  d69db1f0  00000163  00000000  d6b8ddc8  c101a520  d69db1f0  d52aa000 
   00000ff0  d6b8dde8  d88d310f  d6b8a3f8  d52aa000  00001000  d88d502c  d6b8ddfc 
   00001000  d6b8ddf4  c11676ed  d69db1e8  d6b8de24  c11679ad  d52aa000  00000000 
  Call Trace:
   [<
c101a520 >] ? kmap_atomic_prot+0x37/0xa6
   [<
d88d310f >] ghash_update+0x85/0xbe [ghash_generic]
   [<
c11676ed >] crypto_shash_update+0x18/0x1b
   [<
c11679ad >] shash_ahash_update+0x22/0x36
   [<
c11679cc >] shash_async_update+0xb/0xd
   [<
d88ce0ba >] hash_sendpage+0xba/0xf2 [algif_hash]
   [<
c121b24c >] kernel_sendpage+0x39/0x4e
   [<
d88ce000 >] ? 0xd88cdfff
   [<
c121b298 >] sock_sendpage+0x37/0x3e
   [<
c121b261 >] ? kernel_sendpage+0x4e/0x4e
   [<
c10b4dbc >] pipe_to_sendpage+0x56/0x61
   [<
c10b4e1f >] splice_from_pipe_feed+0x58/0xcd
   [<
c10b4d66 >] ? splice_from_pipe_begin+0x10/0x10
   [<
c10b51f5 >] __splice_from_pipe+0x36/0x55
   [<
c10b4d66 >] ? splice_from_pipe_begin+0x10/0x10
   [<
c10b6383 >] splice_from_pipe+0x51/0x64
   [<
c10b63c2 >] ? default_file_splice_write+0x2c/0x2c
   [<
c10b63d5 >] generic_splice_sendpage+0x13/0x15
   [<
c10b4d66 >] ? splice_from_pipe_begin+0x10/0x10
   [<
c10b527f >] do_splice_from+0x5d/0x67
   [<
c10b6865 >] sys_splice+0x2bf/0x363
   [<
c129373b >] ? sysenter_exit+0xf/0x16
   [<
c104dc1e >] ? trace_hardirqs_on_caller+0x10e/0x13f
   [<
c129370c >] sysenter_do_call+0x12/0x32
  Code: 83 c4 0c 5b 5e 5f c9 c3 55 b9 04 00 00 00 89 e5 57 8d 7d e4 56 53 8d 5d e4 83 ec 18 89 45 e0 89 55 dc 0f b6 70 0f c1 e6 04 01 d6 <f3> a5 be 0f 00 00 00 4e 89 d8 e8 48 ff ff ff 8b 45 e0 89 da 0f
  EIP: [<
d88c92d4 >] gf128mul_4k_lle+0x23/0x60 [gf128mul] SS:ESP 0068:
d6b8dda4 
  CR2: 
0000000000000670 
  ---[ end trace 
4eaa2a86a8e2da24  ]---
  note: hashatron[1502] exited with preempt_count 1
  BUG: scheduling while atomic: hashatron/1502/0x10000002
  INFO: lockdep is turned off.
  [...]
Signed-off-by: Nick Bowler <nbowler@elliptictech.com> 
Cc: stable@kernel.org [2.6.37+] 
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 
Marek Szyprowski  [Fri, 21 Oct 2011 09:04:54 +0000  (18:04 +0900)] 
ARM: S5P: fix offset calculation on gpio-interruptReported-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> 
Linus Torvalds  [Thu, 20 Oct 2011 19:16:28 +0000  (22:16 +0300)] 
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Linus Torvalds  [Thu, 20 Oct 2011 19:15:20 +0000  (22:15 +0300)] 
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net