kevin/linux
1
Fork 0
Code
264,509 Commits 1 Branch 830 Tags 5.6 GiB
8535639810
Commit Graph

1457 Commits

Author SHA1 Message Date
Richard Weinberger
8535639810 um: fix ubd cow size 
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
 2011-11-02 14:15:42 +01:00
Al Viro
3369465ed1 um: switch to use of drivers/Kconfig 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:41 +01:00
Al Viro
73395a0002 um: distribute exports to where exported stuff is defined 
ksyms.c is down to the stuff defined in various USER_OBJS

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:36 +01:00
Al Viro
a34978cbd9 um: kill system-um.h 
most of it belonged in irqflags.h, actually

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:34 +01:00
Al Viro
b8c655d727 um: generic ftrace.h will do... 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:34 +01:00
Al Viro
46ecca8ae1 um: segment.h is x86-only and needed only there 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:33 +01:00
Al Viro
c2ad3ad009 um: asm/pda.h is not needed anymore 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:32 +01:00
Al Viro
8e66cda4af um: hw_irq.h can go generic as well 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:31 +01:00
Al Viro
f5e900770f um: switch to generic-y 
kill wrapper headers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:30 +01:00
Al Viro
d805a78603 um: clean Kconfig up a bit 
* 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 <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:29 +01:00
Al Viro
772bd0a5a5 um: kill useless argument of free_chan() and free_one_chan() 
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>
 2011-11-02 14:15:28 +01:00
Al Viro
966e803ab1 um: unify ptrace_user.h 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:27 +01:00
Al Viro
4d211093e8 um: fix gcov build breakage 
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 <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:26 +01:00
Al Viro
c32324e312 um: page_offset.h is never used 
... and neither is the only define in it

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:25 +01:00
Al Viro
3fb77d7256 um: irq_vectors.h just shadows x86 one 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:24 +01:00
Al Viro
ff9586e98f 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>
 2011-11-02 14:15:23 +01:00
Al Viro
8807c1d561 um: asm/apic.h is there only to shadow the x86 one... 
... so take it to arch/um/x86/asm.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:22 +01:00
Al Viro
c506c0e4a7 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>
 2011-11-02 14:15:22 +01:00
Al Viro
b3ee571e58 um: take ldt.h to arch/x86/um/asm/mm_context.h 
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/<subarch>/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 <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:21 +01:00
Al Viro
1bbd5f21f4 um: merge os-Linux/tls.c into arch/x86/um/os-Linux/tls.c 
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 <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:17 +01:00
Al Viro
c5cc32fe14 um: move asm/desc.h into arch/x86/um/asm 
its only purpose is to shadow the x86 asm/desc.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:16 +01:00
Al Viro
4dc706c2f2 um: take um_mmu.h to asm/mmu.h, clean asm/mmu_context.h a bit 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:14 +01:00
Al Viro
fced95cacf um: kill um_uaccess.h 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:13 +01:00
Al Viro
ece67c8697 um: take mconsole*.h to arch/um/drivers 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:12 +01:00
Al Viro
510c72a3cf um: take chan_*.h and line.h to arch/um/drivers 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:12 +01:00
Al Viro
17e052093b 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>
 2011-11-02 14:15:11 +01:00
Al Viro
0a9e70b1cd um: kill shared/mem_kern.h 
... nothing declared there exists

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:10 +01:00
Al Viro
445c5786c9 um: kill shared/tlb.h 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:10 +01:00
Al Viro
c75d053b70 um: make flush_tlb_kernel_range_common() static 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:09 +01:00
Al Viro
5ade8878e0 um: kill shared/task.h and HOST_TASK_REGS 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:08 +01:00
Al Viro
1cf5e62ab9 um: shared/syscall.h is not even included 
... and functions declared in it do not exist

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:08 +01:00
Al Viro
dbddc51bc8 um: don't include kern.h unless it's needed 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:07 +01:00
Al Viro
429172ccf0 um: trim kern.h 
most of the functions in there are not used in anything that ends up
including that header...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:07 +01:00
Al Viro
549e78db94 um: make load_initrd() static, kill shared/initrd.h 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:06 +01:00
Al Viro
0acdbbeb6d um: bury unused macros around ptrace.h 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:05 +01:00
Al Viro
5c48b108ec um: take arch/um/sys-x86 to arch/x86/um 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:05 +01:00
Al Viro
7bbe7204e9 um: merge Makefile-{i386,x86_64} 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:04 +01:00
Al Viro
a6e77d6c74 um: trim detritus from Makefile-i386 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:03 +01:00
Al Viro
9aecaa6a8a um: arch_hweight.h is needed only on uml-x86 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:03 +01:00
Al Viro
709585063f um: merge kernel_offsets_*.h 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:02 +01:00
Al Viro
c75361bddb um: merge skas_ptrace.h 32/64bit variants 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:01 +01:00
Al Viro
62982ad6b0 um: sysdep/barrier.h is not used for anything 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:01 +01:00
Al Viro
0de021f797 um: shared/process.h is empty now; kill it 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:15:00 +01:00
Al Viro
ab1c0cc7c9 um: finish conversion to mcontext_t 
now we don't mix host and guest signal frame layouts anymore; moreover,
we don't need host's struct sigcontext at all.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:14:59 +01:00
Al Viro
248b74c79e um: start switching the references to host mcontext_t to its userland type 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:14:59 +01:00
Al Viro
05c46db4d7 um: take userland definition of barrier() to user.h 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:14:58 +01:00
Al Viro
dd768c56da um: take system.h out of shared/sysdep 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:14:57 +01:00
Al Viro
00361683ce um: fill the handlers array at build time 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:14:57 +01:00
Al Viro
e87df986ed um: simplify set_handler() 
For one thing, we always block the same signals (IRQ ones - IO, WINCH, VTALRM),
so there's no need to pass sa_mask elements in arguments.  For another, the
flags depend only on whether it's an IRQ signal or not (we add SA_RESTART
for them).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:14:56 +01:00
Al Viro
d5c7e8b4ec um: don't bother blocking SIGARLM and SIGUSR1 
We used to generate those, but we hadn't done that for a long
time.  No need to bother blocking them for signal handlers.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
 2011-11-02 14:14:55 +01:00