Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa453a62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML changes from Richard Weinberger:
 "Mostly bug fixes and cleanups"

* 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (35 commits)
  um: Update defconfig
  um: Switch to large mcmodel on x86_64
  MTD: Relax dependencies
  um: Wire CONFIG_GENERIC_IO up
  um: Serve io_remap_pfn_range()
  Introduce CONFIG_GENERIC_IO
  um: allow SUBARCH=x86
  um: most of the SUBARCH uses can be killed
  um: deadlock in line_write_interrupt()
  um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS
  um: use the right ifdef around exports in user_syms.c
  um: a bunch of headers can be killed by using generic-y
  um: ptrace-generic.h doesn't need user.h
  um: kill HOST_TASK_PID
  um: remove pointless include of asm/fixmap.h from asm/pgtable.h
  um: asm-offsets.h might as well come from underlying arch...
  um: merge processor_{32,64}.h a bit...
  um: switch close_chan() to struct line
  um: race fix: initialize delayed_work *before* registering IRQ
  um: line->have_irq is never checked...
  ...
parents 30eebb54 3463ff44

arch/um/Kconfig.common

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config UML 
	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_SHOW

	select GENERIC_CPU_DEVICES

	select GENERIC_IO



config MMU

	bool

arch/um/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ ifeq ($(SUBARCH),i386) 
endif

ifeq ($(SUBARCH),x86_64)

        HEADER_ARCH := x86

	KBUILD_CFLAGS += -mcmodel=large

endif



HOST_DIR := arch/$(HEADER_ARCH)
@@ -50,7 +51,7 @@ KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um 
#

# These apply to USER_CFLAGS to.



KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \

KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \

	$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap	\

	-Din6addr_loopback=kernel_in6addr_loopback \

	-Din6addr_any=kernel_in6addr_any -Dstrrchr=kernel_strrchr
@@ -99,7 +100,7 @@ KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig 


archheaders:

	$(Q)$(MAKE) -C '$(srctree)' KBUILD_SRC= \

		ARCH=$(SUBARCH) O='$(objtree)' archheaders

		ARCH=$(HEADER_ARCH) O='$(objtree)' archheaders



archprepare: include/generated/user_constants.h