Re: [patch 25/59] Fix UML on non-standard VM split hosts

Randy Dunlap
2007-02-04T01:15:56Z

On Fri, 02 Feb 2007 18:35:29 -0800 Chris Wright wrote:

> -stable review patch. If anyone has any objections, please let us know.
> ------------------
>
> From: Jeff Dike <jdike@addtoit.com>
>
> This fixes UML on hosts with non-standard VM splits. We had changed
> the config variable that controls UML behavior on such hosts, but not
> propogated the change everywhere. In particular, the values of
> STUB_CODE and STUB_DATA relied on the old variable.
>
> I also reformatted the HOST_VMSPLIT_3G help to make it more standard.

The reformatting looks bad to me. Kconfig help text should be
indented consistently by 2 spaces under "help".

This can be fixed later if you don't want to drop it from -stable.

> Spotted by uml@flonatel.org.
>
> Signed-off-by: Jeff Dike <jdike@addtoit.com>
> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
> --
> arch/um/Kconfig.i386 | 38 +++++++++++++++++++-------------------
> 1 file changed, 19 insertions(+), 19 deletions(-)
>
> --- linux-2.6.19.2.orig/arch/um/Kconfig.i386
> +++ linux-2.6.19.2/arch/um/Kconfig.i386
> @@ -19,22 +19,22 @@ config SEMAPHORE_SLEEPERS
> choice
> prompt "Host memory split"
> default HOST_VMSPLIT_3G
> - ---help---
> - This is needed when the host kernel on which you run has a non-default
> - (like 2G/2G) memory split, instead of the customary 3G/1G. If you did
> - not recompile your own kernel but use the default distro's one, you can
> - safely accept the "Default split" option.
> -
> - It can be enabled on recent (>=2.6.16-rc2) vanilla kernels via
> - CONFIG_VM_SPLIT_*, or on previous kernels with special patches (-ck
> - patchset by Con Kolivas, or other ones) - option names match closely the
> - host CONFIG_VM_SPLIT_* ones.
> -
> - A lower setting (where 1G/3G is lowest and 3G/1G is higher) will
> - tolerate even more "normal" host kernels, but an higher setting will be
> - stricter.
> + help
> + This is needed when the host kernel on which you run has a non-default
> + (like 2G/2G) memory split, instead of the customary 3G/1G. If you did
> + not recompile your own kernel but use the default distro's one, you can
> + safely accept the "Default split" option.
> +
> + It can be enabled on recent (>=2.6.16-rc2) vanilla kernels via
> + CONFIG_VM_SPLIT_*, or on previous kernels with special patches (-ck
> + patchset by Con Kolivas, or other ones) - option names match closely the
> + host CONFIG_VM_SPLIT_* ones.
> +
> + A lower setting (where 1G/3G is lowest and 3G/1G is higher) will
> + tolerate even more "normal" host kernels, but an higher setting will be
> + stricter.
>
> - So, if you do not know what to do here, say 'Default split'.
> + So, if you do not know what to do here, say 'Default split'.
>
> config HOST_VMSPLIT_3G
> bool "Default split (3G/1G user/kernel host split)"

---
~Randy