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

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

Merge tag 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML updates from Richard Weinberger:
 - hostfs saw a face lifting
 - old/broken stuff was removed (SMP, HIGHMEM, SKAS3/4)
 - random cleanups and bug fixes

* tag 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (26 commits)
  um: Print minimum physical memory requirement
  um: Move uml_postsetup in the init_thread stack
  um: add a kmsg_dumper
  x86, UML: fix integer overflow in ELF_ET_DYN_BASE
  um: hostfs: Reduce number of syscalls in readdir
  um: Remove broken highmem support
  um: Remove broken SMP support
  um: Remove SKAS3/4 support
  um: Remove ppc cruft
  um: Remove ia64 cruft
  um: Remove dead code from stacktrace
  hostfs: No need to box and later unbox the file mode
  hostfs: Use page_offset()
  hostfs: Set page flags in hostfs_readpage() correctly
  hostfs: Remove superfluous initializations in hostfs_open()
  hostfs: hostfs_open: Reset open flags upon each retry
  hostfs: Remove superfluous test in hostfs_open()
  hostfs: Report append flag in ->show_options()
  hostfs: Use __getname() in follow_link
  hostfs: Remove open coded strcpy()
  ...
parents d6138969 fe205bdd

arch/um/Kconfig.um

+0 −42
Original line number Diff line number Diff line
@@ -95,48 +95,6 @@ config MAGIC_SYSRQ 
	  The keys are documented in <file:Documentation/sysrq.txt>. Don't say Y

	  unless you really know what this hack does.



config SMP

	bool "Symmetric multi-processing support"

	default n

	depends on BROKEN

	help

	  This option enables UML SMP support.

	  It is NOT related to having a real SMP box. Not directly, at least.



	  UML implements virtual SMP by allowing as many processes to run

	  simultaneously on the host as there are virtual processors configured.



	  Obviously, if the host is a uniprocessor, those processes will

	  timeshare, but, inside UML, will appear to be running simultaneously.

	  If the host is a multiprocessor, then UML processes may run

	  simultaneously, depending on the host scheduler.



	  This, however, is supported only in TT mode. So, if you use the SKAS

	  patch on your host, switching to TT mode and enabling SMP usually

	  gives	you worse performances.

	  Also, since the support for SMP has been under-developed, there could

	  be some bugs being exposed by enabling SMP.



	  If you don't know what to do, say N.



config NR_CPUS

	int "Maximum number of CPUs (2-32)"

	range 2 32

	depends on SMP

	default "32"



config HIGHMEM

	bool "Highmem support"

	depends on !64BIT && BROKEN

	default n

	help

	  This was used to allow UML to run with big amounts of memory.

	  Currently it is unstable, so if unsure say N.



	  To use big amounts of memory, it is recommended enable static

	  linking (i.e. CONFIG_STATIC_LINK) - this should allow the

	  guest to use up to 2.75G of memory.



config KERNEL_STACK_ORDER

	int "Kernel stack size order"

	default 1 if 64BIT

arch/um/Makefile-ia64

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
START_ADDR = 0x1000000000000000

arch/um/Makefile-ppc

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
ifeq ($(CONFIG_HOST_2G_2G), y)

START_ADDR = 0x80000000

else

START_ADDR = 0xc0000000

endif

ARCH_CFLAGS = -U__powerpc__ -D__UM_PPC__



# The arch is ppc, but the elf32 name is powerpc

ELF_SUBARCH = powerpc

arch/um/include/asm/fixmap.h

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ 
 * fix-mapped?

 */

enum fixed_addresses {

#ifdef CONFIG_HIGHMEM

	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */

	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,

#endif

	__end_of_fixed_addresses

};

arch/um/include/asm/pgtable.h

+1 −5
Original line number Diff line number Diff line
@@ -47,11 +47,7 @@ extern unsigned long end_iomem; 
#define VMALLOC_OFFSET	(__va_space)

#define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))

#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)

#ifdef CONFIG_HIGHMEM

# define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)

#else

#define VMALLOC_END	(FIXADDR_START-2*PAGE_SIZE)

#endif

#define MODULES_VADDR	VMALLOC_START

#define MODULES_END	VMALLOC_END

#define MODULES_LEN	(MODULES_VADDR - MODULES_END)