mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-22 06:58:36 +00:00
Untangle UML headers somewhat and add some includes where they were needed explicitly, but gotten accidentally via some other header. arch/um/include/um_uaccess.h loses asm/fixmap.h because it uses no fixmap stuff and gains elf.h, because it needs FIXADDR_USER_*, and archsetjmp.h, because it needs jmp_buf. pmd_alloc_one is uninlined because it needs mm_struct, and that's inconvenient to provide in asm-um/pgtable-3level.h. elf_core_copy_fpregs is also uninlined from elf-i386.h and elf-x86_64.h, which duplicated the code anyway, to arch/um/kernel/process.c, so that the reference to current_thread doesn't pull sched.h or anything related into asm/elf.h. arch/um/sys-i386/ldt.c, arch/um/kernel/tlb.c and arch/um/kernel/skas/uaccess.c got sched.h because they dereference task_structs. Its includes of linux and asm headers got turned from "" to <>. arch/um/sys-i386/bug.c gets asm/errno.h because it needs errno constants. asm/elf-i386 gets asm/user.h because it needs user_regs_struct. asm/fixmap.h gets page.h because it needs PAGE_SIZE and PAGE_MASK and system.h for BUG_ON. asm/pgtable doesn't need sched.h. asm/processor-generic.h defined mm_segment_t, but didn't use it. So, that definition is moved to uaccess.h, which defines a bunch of mm_segment_t-related stuff. thread_info.h uses mm_segment_t, and includes uaccess.h, which causes a recursion. So, the definition is placed above the include of thread_info. in uaccess.h. thread_info.h also gets page.h because it needs PAGE_SIZE. ObCheckpatchViolationJustification - I'm not adding a typedef; I'm moving mm_segment_t from one place to another. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
History
|
|
|---|---|---|
| .. | ||
| skas | ||
| sysdep-i386 | ||
| sysdep-ia64 | ||
| sysdep-ppc | ||
| sysdep-x86_64 | ||
| aio.h | ||
| arch.h | ||
| as-layout.h | ||
| chan_kern.h | ||
| chan_user.h | ||
| common-offsets.h | ||
| elf_user.h | ||
| frame_kern.h | ||
| init.h | ||
| initrd.h | ||
| irq_kern.h | ||
| irq_user.h | ||
| kern.h | ||
| kern_util.h | ||
| line.h | ||
| longjmp.h | ||
| mconsole.h | ||
| mconsole_kern.h | ||
| mem.h | ||
| mem_kern.h | ||
| mem_user.h | ||
| net_kern.h | ||
| net_user.h | ||
| os.h | ||
| process.h | ||
| ptrace_user.h | ||
| registers.h | ||
| sigcontext.h | ||
| sigio.h | ||
| skas_ptrace.h | ||
| skas_ptregs.h | ||
| syscall.h | ||
| sysrq.h | ||
| task.h | ||
| tempfile.h | ||
| tlb.h | ||
| ubd_user.h | ||
| um_malloc.h | ||
| um_mmu.h | ||
| um_uaccess.h | ||
| user.h | ||