03 Nov, 2011

1 commit

• de0a5345a   Merge branch 'for-linus' of git://github.com/richardweinberger/linux ... Browse Code »

  * '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
  ...

  Linus Torvalds

  2011-11-03 00:45:39 +0800  

02 Nov, 2011

39 commits

• 853563981   um: fix ubd cow size ... Browse Code »

  1

  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
  CC: stable@kernel.org

  Richard Weinberger

  2011-11-02 21:15:42 +0800  
• 3369465ed   um: switch to use of drivers/Kconfig ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:41 +0800  
• 73395a000   um: distribute exports to where exported stuff is defined ... Browse Code »

  ksyms.c is down to the stuff defined in various USER_OBJS

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:36 +0800  
• a34978cbd   um: kill system-um.h ... Browse Code »

  most of it belonged in irqflags.h, actually

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:34 +0800  
• b8c655d72   um: generic ftrace.h will do... ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:34 +0800  
• 46ecca8ae   um: segment.h is x86-only and needed only there ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:33 +0800  
• c2ad3ad00   um: asm/pda.h is not needed anymore ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:32 +0800  
• 8e66cda4a   um: hw_irq.h can go generic as well ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:31 +0800  
• f5e900770   um: switch to generic-y ... Browse Code »

  kill wrapper headers

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:30 +0800  
• d805a7860   um: clean Kconfig up a bit ... Browse Code »

  * kill duplicates with drivers/char/Kconfig
  * take watchdog one into drivers/watchdog/Kconfig
  * take mmapper to arch/um/Kconfig.um
  * rename Kconfig.char menu to "UML Character Devices"

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:29 +0800  
• 772bd0a5a   um: kill useless argument of free_chan() and free_one_chan() ... Browse Code »

  delay_free_irq is always 0 for those...

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:28 +0800  
• 966e803ab   um: unify ptrace_user.h ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:27 +0800  
• 4d211093e   um: fix gcov build breakage ... Browse Code »

  a) exports in gmon_syms.c duplicate kernel/gcov/* ones
  b) excluding -pg in vdso compile is not enough - -fprofile-arcs
  and -ftest-coverage also needs to be excluded

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:26 +0800  
• c32324e31   um: page_offset.h is never used ... Browse Code »

  ... and neither is the only define in it

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:25 +0800  
• 3fb77d725   um: irq_vectors.h just shadows x86 one ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:24 +0800  
• ff9586e98   um: required-features.h is there only to shadow x86 one... ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:23 +0800  
• 8807c1d56   um: asm/apic.h is there only to shadow the x86 one... ... Browse Code »

  ... so take it to arch/um/x86/asm.

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:22 +0800  
• c506c0e4a   um: take ubd_user.h to its users... ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:22 +0800  
• b3ee571e5   um: take ldt.h to arch/x86/um/asm/mm_context.h ... Browse Code »

  it's x86-only and we have no business playing with it in asm/mmu.h; make
  the latter have
  struct uml_arch_mm_context arch;
  instead of
  struct uml_ldt ldt;
  and let arch//um/asm/mm_context.h decide what'll be in there.
  While we are at it, kill host_ldt.h - it's not needed in part of places
  that include it (we want asm/ldt.h in those) and it can be trivially
  expanded into the single remaining one.

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:21 +0800  
• 1bbd5f21f   um: merge os-Linux/tls.c into arch/x86/um/os-Linux/tls.c ... Browse Code »

  it's i386-specific; moreover, analogs on other targets have
  incompatible interface - PTRACE_GET_THREAD_AREA does exist
  elsewhere, but struct user_desc does *not*

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:17 +0800  
• c5cc32fe1   um: move asm/desc.h into arch/x86/um/asm ... Browse Code »

  its only purpose is to shadow the x86 asm/desc.h

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:16 +0800  
• 4dc706c2f   um: take um_mmu.h to asm/mmu.h, clean asm/mmu_context.h a bit ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:14 +0800  
• fced95cac   um: kill um_uaccess.h ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:13 +0800  
• ece67c869   um: take mconsole*.h to arch/um/drivers ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:12 +0800  
• 510c72a3c   um: take chan_*.h and line.h to arch/um/drivers ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:12 +0800  
• 17e052093   um: take register_winch_irq() into the caller of is_skas_winch() ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:11 +0800  
• 0a9e70b1c   um: kill shared/mem_kern.h ... Browse Code »

  ... nothing declared there exists

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:10 +0800  
• 445c5786c   um: kill shared/tlb.h ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:10 +0800  
• c75d053b7   um: make flush_tlb_kernel_range_common() static ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:09 +0800  
• 5ade8878e   um: kill shared/task.h and HOST_TASK_REGS ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:08 +0800  
• 1cf5e62ab   um: shared/syscall.h is not even included ... Browse Code »

  ... and functions declared in it do not exist

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:08 +0800  
• dbddc51bc   um: don't include kern.h unless it's needed ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:07 +0800  
• 429172ccf   um: trim kern.h ... Browse Code »

  most of the functions in there are not used in anything that ends up
  including that header...

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:07 +0800  
• 549e78db9   um: make load_initrd() static, kill shared/initrd.h ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:06 +0800  
• 0acdbbeb6   um: bury unused macros around ptrace.h ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:05 +0800  
• 5c48b108e   um: take arch/um/sys-x86 to arch/x86/um ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:05 +0800  
• 7bbe7204e   um: merge Makefile-{i386,x86_64} ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:04 +0800  
• a6e77d6c7   um: trim detritus from Makefile-i386 ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:03 +0800  
• 9aecaa6a8   um: arch_hweight.h is needed only on uml-x86 ... Browse Code »

  Signed-off-by: Al Viro
  Signed-off-by: Richard Weinberger

  Al Viro

  2011-11-02 21:15:03 +0800