Skip to contentSkip to conversation

UML changes for 3.4-rc1

GIT PULL Richard Weinberger 1 participant 1 message Mar 25, 2012 User-mode Linux (UML)

lore
Share & tools
lore

Richard Weinberger

author maintainer
#0 lore raw

Linus,

This are the UML changes for for 3.4-rc1.
Mostly bug fixes and cleanups.

Thanks,
//richard

---
The following changes since commit c16fa4f2ad19908a47c63d8fa436a1178438c7e7:

Linux 3.3 (2012-03-18 16:15:34 -0700)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git for-linus-3.4-rc1

Al Viro (27):
um: clean up the includes in ubd
um: auxvec.h is never used
um: switch line_remove() to setup_one_line()
um: switch line_config() to setup_one_line()
um: get rid of the init_prio mess
um: convert count_lock to mutex, fix a race in line_open()
um: fix races between line_open() and line_config()
um: switch line.c tty drivers to dynamic device creation
um: get rid of lines_init()
um: finally kill ->init_str leaks
um: sorting out the chan mess, part 1
um: switch users of ->chan_list to ->chan_{in,out} (easy cases)
um: chan_init_pri is dead now
um: line->have_irq is never checked...
um: race fix: initialize delayed_work *before* registering IRQ
um: switch close_chan() to struct line
um: merge processor_{32,64}.h a bit...
um: asm-offsets.h might as well come from underlying arch...
um: remove pointless include of asm/fixmap.h from asm/pgtable.h
um: kill HOST_TASK_PID
um: ptrace-generic.h doesn't need user.h
um: a bunch of headers can be killed by using generic-y
um: use the right ifdef around exports in user_syms.c
um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS
um: deadlock in line_write_interrupt()
um: most of the SUBARCH uses can be killed
um: allow SUBARCH=x86

Geert Uytterhoeven (1):
uml/hostfs: Propagate dirent.d_type to filldir()

Richard Weinberger (6):
Introduce CONFIG_GENERIC_IO
um: Serve io_remap_pfn_range()
um: Wire CONFIG_GENERIC_IO up
MTD: Relax dependencies
um: Switch to large mcmodel on x86_64
um: Update defconfig

Yong Zhang (1):
um: irq: Remove IRQF_DISABLED

 arch/um/Kconfig.common                  |    1 +
 arch/um/Makefile                        |    5 +-
 arch/um/defconfig                       |  655 ++++++++++++++++++++++---------
 arch/um/drivers/chan.h                  |   18 +-
 arch/um/drivers/chan_kern.c             |  198 ++++------
 arch/um/drivers/chan_user.h             |    2 -
 arch/um/drivers/line.c                  |  258 ++++++-------
 arch/um/drivers/line.h                  |   29 +-
 arch/um/drivers/mconsole_kern.c         |    2 +-
 arch/um/drivers/net_kern.c              |    2 +-
 arch/um/drivers/port_kern.c             |    4 +-
 arch/um/drivers/random.c                |    2 +-
 arch/um/drivers/ssl.c                   |   41 +-
 arch/um/drivers/stdio_console.c         |   46 ++--
 arch/um/drivers/{ubd_user.h => ubd.h}   |    0
 arch/um/drivers/ubd_kern.c              |   46 +--
 arch/um/drivers/ubd_user.c              |    8 +-
 arch/um/drivers/xterm_kern.c            |    2 +-
 arch/um/include/asm/Kbuild              |    2 +-
 arch/um/include/asm/asm-offsets.h       |    1 -
 arch/um/include/asm/auxvec.h            |    4 -
 arch/um/include/asm/current.h           |   13 -
 arch/um/include/asm/delay.h             |   18 -
 arch/um/include/asm/io.h                |   57 ---
 arch/um/include/asm/mutex.h             |    9 -
 arch/um/include/asm/param.h             |   20 -
 arch/um/include/asm/pci.h               |    6 -
 arch/um/include/asm/pgalloc.h           |    3 +-
 arch/um/include/asm/pgtable.h           |    2 +
 arch/um/include/asm/ptrace-generic.h    |    1 -
 arch/um/include/shared/common-offsets.h |    2 -
 arch/um/include/shared/kern_util.h      |    2 +-
 arch/um/kernel/Makefile                 |    2 +-
 arch/um/kernel/process.c                |    4 +-
 arch/um/kernel/sigio.c                  |    2 +-
 arch/um/kernel/time.c                   |    2 +-
 arch/um/os-Linux/Makefile               |    2 -
 arch/um/os-Linux/user_syms.c            |    2 +-
 arch/um/scripts/Makefile.rules          |    7 +-
 arch/x86/Makefile.um                    |    4 -
 arch/x86/um/Kconfig                     |    4 +-
 arch/x86/um/asm/processor.h             |   10 +
 arch/x86/um/asm/processor_32.h          |   10 -
 arch/x86/um/asm/processor_64.h          |   10 -
 arch/x86/um/bugs_32.c                   |    4 +-
 drivers/mtd/Kconfig                     |    2 +-
 drivers/mtd/devices/Kconfig             |    1 +
 drivers/mtd/maps/Kconfig                |    1 +
 drivers/mtd/nand/Kconfig                |    2 +
 drivers/mtd/onenand/Kconfig             |    1 +
 fs/hostfs/hostfs.h                      |    3 +-
 fs/hostfs/hostfs_kern.c                 |    5 +-
 fs/hostfs/hostfs_user.c                 |    4 +-
 lib/Kconfig                             |    5 +
 54 files changed, 813 insertions(+), 733 deletions(-)
 rename arch/um/drivers/{ubd_user.h => ubd.h} (100%)
 delete mode 100644 arch/um/include/asm/asm-offsets.h
 delete mode 100644 arch/um/include/asm/auxvec.h
 delete mode 100644 arch/um/include/asm/current.h
 delete mode 100644 arch/um/include/asm/delay.h
 delete mode 100644 arch/um/include/asm/io.h
 delete mode 100644 arch/um/include/asm/mutex.h
 delete mode 100644 arch/um/include/asm/param.h
 delete mode 100644 arch/um/include/asm/pci.h