ChangeSet 1.2231.1.72, 2005/03/28 19:36:37-08:00, [EMAIL PROTECTED]

        [PATCH] x86_64: mem=XXX will now limit kernel memory to XXX instead of 
XXX+1MB
        
        mem=XXX will now limit kernel memory to XXX instead of XXX+1MB
        
        Signed-off-by: Suresh Siddha <[EMAIL PROTECTED]>
        Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
        Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
        Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>



 e820.c |   16 +---------------
 1 files changed, 1 insertion(+), 15 deletions(-)


diff -Nru a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
--- a/arch/x86_64/kernel/e820.c 2005-03-28 21:22:22 -08:00
+++ b/arch/x86_64/kernel/e820.c 2005-03-28 21:22:22 -08:00
@@ -507,21 +507,7 @@
 
 void __init parse_memopt(char *p, char **from) 
 { 
-       /*
-        * mem=XXX[kKmM] limits kernel memory to XXX+1MB
-        *
-        * It would be more logical to count from 0 instead of from
-        * HIGH_MEMORY, but we keep that for now for i386 compatibility. 
-        *      
-        * No support for custom mapping like i386.  The reason is
-        * that we need to read the e820 map anyways to handle the
-        * ACPI mappings in the direct map.  Also on x86-64 there
-        * should be always a good e820 map. This is only an upper
-        * limit, you cannot force usage of memory not in e820.
-        *
-        * -AK
-                        */
-       end_user_pfn = memparse(p, from) + HIGH_MEMORY;
+       end_user_pfn = memparse(p, from);
        end_user_pfn >>= PAGE_SHIFT;    
 } 
 
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to