Attachment 317981 Details for Bug 464500 – RHEL5 fix for this issue

[patch] RHEL5 fix for this issue

464500.patch (text/plain), 1.52 KB, created by Prarit Bhargava on 2008-09-29 13:44:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-09-29 13:44:41 UTC

Size: 1.52 KB

patch

obsolete

>Backport 2.6.27-rc7 behavior for memmap kernel options into i386 arch.  x86_64
>already mimics upstream.
>
>Customer reports that specifying memmap=X$Y as boot parameter does not
>generate a user-defined physical map.
>
>Upstream has a panic() in place of the printk() below.  I'm using printk()
>to avoid crashing any existing systems even though they are configured
>in a potentially harmful way.
>
>Resolves BZ 464500.
>
>diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
>index 98e936d..362939b 100644
>--- a/arch/i386/kernel/setup.c
>+++ b/arch/i386/kernel/setup.c
>@@ -799,6 +799,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
> 				unsigned long long start_at, mem_size;
>  
> 				mem_size = memparse(from+7, &from);
>+				userdef=1;
> 				if (*from == '@') {
> 					start_at = memparse(from+1, &from);
> 					add_memory_region(start_at, mem_size, E820_RAM);
>@@ -808,10 +809,8 @@ static void __init parse_cmdline_early (char ** cmdline_p)
> 				} else if (*from == '$') {
> 					start_at = memparse(from+1, &from);
> 					add_memory_region(start_at, mem_size, E820_RESERVED);
>-				} else {
>+				} else
> 					limit_regions(mem_size);
>-					userdef=1;
>-				}
> 			}
> 		}
> 
>@@ -957,6 +956,10 @@ static void __init parse_cmdline_early (char ** cmdline_p)
> 	*to = '\0';
> 	*cmdline_p = command_line;
> 	if (userdef) {
>+		char nr = e820.nr_map;
>+		if (sanitize_e820_map(e820.map, &nr) < 0)
>+			printk("Invalid user supplied memory map\n");
>+		e820.nr_map = nr;
> 		printk(KERN_INFO "user-defined physical RAM map:\n");
> 		print_memory_map("user");
> 	}

Actions: View | Diff

Attachments on bug 464500: 317981