-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jeff Dike <[email protected]>
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.
Spotted by [email protected].
Signed-off-by: Jeff Dike <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
--
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)"
@@ -67,13 +67,13 @@ config 3_LEVEL_PGTABLES
config STUB_CODE
hex
- default 0xbfffe000 if !HOST_2G_2G
- default 0x7fffe000 if HOST_2G_2G
+ default 0xbfffe000 if !HOST_VMSPLIT_2G
+ default 0x7fffe000 if HOST_VMSPLIT_2G
config STUB_DATA
hex
- default 0xbffff000 if !HOST_2G_2G
- default 0x7ffff000 if HOST_2G_2G
+ default 0xbffff000 if !HOST_VMSPLIT_2G
+ default 0x7ffff000 if HOST_VMSPLIT_2G
config STUB_START
hex
--
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 <[email protected]>
>
> 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 [email protected].
>
> Signed-off-by: Jeff Dike <[email protected]>
> Signed-off-by: Chris Wright <[email protected]>
> --
> 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
On Sat, Feb 03, 2007 at 05:06:54PM -0800, Randy Dunlap wrote:
> 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.
The formatting actually broke the Kconfig option, which was noticed by
Al Viro, who sent a patch, which I forwarded to -stable.
Jeff
--
Work email - jdike at linux dot intel dot com
On Sat, 3 Feb 2007 22:11:52 -0500 Jeff Dike wrote:
> On Sat, Feb 03, 2007 at 05:06:54PM -0800, Randy Dunlap wrote:
> > 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.
>
> The formatting actually broke the Kconfig option, which was noticed by
> Al Viro, who sent a patch, which I forwarded to -stable.
I think that's different lines of text. What is currently in
http://www.kernel.org/pub/linux/kernel/people/chrisw/stable/patch-2.6.19.3-rc1.{gz,bz2}
still looks like is contains bad indentation.
---
~Randy