linux-toradex.git/arch/um/drivers, branch v3.2.3 Linux kernel for Apalis and Colibri modules Merge branch 'for-linus' of git://github.com/richardweinberger/linux 2011-11-02T16:45:39+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-11-02T16:45:39+00:00 de0a5345a55b8dd5a4695181275df0e691176830 * 'for-linus' of git://github.com/richardweinberger/linux: (90 commits) um: fix ubd cow size um: Fix kmalloc argument order in um/vdso/vma.c um: switch to use of drivers/Kconfig UserModeLinux-HOWTO.txt: fix a typo UserModeLinux-HOWTO.txt: remove ^H characters um: we need sys/user.h only on i386 um: merge delay_{32,64}.c um: distribute exports to where exported stuff is defined um: kill system-um.h um: generic ftrace.h will do... um: segment.h is x86-only and needed only there um: asm/pda.h is not needed anymore um: hw_irq.h can go generic as well um: switch to generic-y um: clean Kconfig up a bit um: a couple of missing dependencies... um: kill useless argument of free_chan() and free_one_chan() um: unify ptrace_user.h um: unify KSTK_... um: fix gcov build breakage ... 
* 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
  um: fix ubd cow size
  um: Fix kmalloc argument order in um/vdso/vma.c
  um: switch to use of drivers/Kconfig
  UserModeLinux-HOWTO.txt: fix a typo
  UserModeLinux-HOWTO.txt: remove ^H characters
  um: we need sys/user.h only on i386
  um: merge delay_{32,64}.c
  um: distribute exports to where exported stuff is defined
  um: kill system-um.h
  um: generic ftrace.h will do...
  um: segment.h is x86-only and needed only there
  um: asm/pda.h is not needed anymore
  um: hw_irq.h can go generic as well
  um: switch to generic-y
  um: clean Kconfig up a bit
  um: a couple of missing dependencies...
  um: kill useless argument of free_chan() and free_one_chan()
  um: unify ptrace_user.h
  um: unify KSTK_...
  um: fix gcov build breakage
  ...
um: fix ubd cow size 2011-11-02T13:15:42+00:00 Richard Weinberger richard@nod.at 2011-11-02T12:17:27+00:00 8535639810e578960233ad39def3ac2157b0c3ec ubd_file_size() cannot use ubd_dev->cow.file because at this time ubd_dev->cow.file is not initialized. Therefore, ubd_file_size() will always report a wrong disk size when COW files are used. Reading from /dev/ubd* would crash the kernel. We have to read the correct disk size from the COW file's backing file. Signed-off-by: Richard Weinberger <richard@nod.at> CC: stable@kernel.org 
ubd_file_size() cannot use ubd_dev->cow.file because at this time
ubd_dev->cow.file is not initialized.
Therefore, ubd_file_size() will always report a wrong disk size when
COW files are used.
Reading from /dev/ubd* would crash the kernel.

We have to read the correct disk size from the COW file's backing
file.

Signed-off-by: Richard Weinberger <richard@nod.at>
CC: stable@kernel.org
um: kill useless argument of free_chan() and free_one_chan() 2011-11-02T13:15:28+00:00 Al Viro viro@ftp.linux.org.uk 2011-08-18T19:12:39+00:00 772bd0a5a5ebfd37186df086c0f51f676495c4d9 delay_free_irq is always 0 for those... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
delay_free_irq is always 0 for those...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
um: take ubd_user.h to its users... 2011-11-02T13:15:22+00:00 Al Viro viro@ftp.linux.org.uk 2011-08-18T19:10:59+00:00 c506c0e4a730b436b082fa398ec1d8ae9433b2eb Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
um: take mconsole*.h to arch/um/drivers 2011-11-02T13:15:12+00:00 Al Viro viro@ftp.linux.org.uk 2011-08-18T19:08:39+00:00 ece67c8697f32699f6977d3d1ae2ae9f7892a913 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
um: take chan_*.h and line.h to arch/um/drivers 2011-11-02T13:15:12+00:00 Al Viro viro@ftp.linux.org.uk 2011-08-18T19:08:29+00:00 510c72a3cf51c9463db64eb6c21347f4940a202f Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
um: take register_winch_irq() into the caller of is_skas_winch() 2011-11-02T13:15:11+00:00 Al Viro viro@ftp.linux.org.uk 2011-08-18T19:08:19+00:00 17e052093bcd21eaf9eb6e792cd76fdc4f0e3505 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
um: kill shared/mem_kern.h 2011-11-02T13:15:10+00:00 Al Viro viro@ftp.linux.org.uk 2011-08-18T19:08:09+00:00 0a9e70b1cd0f7ee82a65d19edfcd31664ef65f69 ... nothing declared there exists Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
... nothing declared there exists

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
um: don't include kern.h unless it's needed 2011-11-02T13:15:07+00:00 Al Viro viro@ftp.linux.org.uk 2011-08-18T19:07:19+00:00 dbddc51bc8557525bcc51ad8f4e1626e5f586ebc Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
um: -include user.h for USER_OBJ, trim includes 2011-11-02T13:14:44+00:00 Al Viro viro@ftp.linux.org.uk 2011-08-18T19:01:29+00:00 078073a3d48ce7c140f1538d249da3ac545065a6 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>