Re: aperture_64.c: corner case wrong

From: Pavel Machek
Date: Tue May 27 2008 - 05:05:32 EST


Try to convert comments in aperture_64.c closer to
english. Unfortunately, I was not able to understand some of the
sentences :-(. Help welcome.

Signed-off-by: Pavel Machek <pavel@xxxxxxx>

diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index 5373f78..183d907 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -75,21 +75,20 @@ static u32 __init allocate_aperture(void
/*
* Aperture has to be naturally aligned. This means a 2GB aperture
* won't have much chance of finding a place in the lower 4GB of
- * memory. Unfortunately we cannot move it up because that would
+ * memory. Unfortunately, we cannot move it up because that would
* make the IOMMU useless.
- */
- /*
- * using 512M as goal, in case kexec will load kernel_big
+ *
+ * Using 512M as goal, in case kexec will load kernel_big
* that will do the on position decompress, and could overlap with
* that positon with gart that is used.
- * sequende:
+ * sequence:
* kernel_small
* ==> kexec (with kdump trigger path or previous doesn't shutdown gart)
- * ==> kernel_small(gart area become e820_reserved)
+ * ==> kernel_small (gart area becomes e820_reserved)
* ==> kexec (with kdump trigger path or previous doesn't shutdown gart)
- * ==> kerne_big (uncompressed size will be big than 64M or 128M)
+ * ==> kernel_big (uncompressed size will be bigger than 64M or 128M)
* so don't use 512M below as gart iommu, leave the space for kernel
- * code for safe
+ * code to be safe.
*/
p = __alloc_bootmem_nopanic(aper_size, aper_size, 512ULL<<20);
if (!p || __pa(p)+aper_size > 0xffffffff) {
@@ -262,14 +261,15 @@ early_param("gart_fix_e820", parse_gart_
void __init early_gart_iommu_check(void)
{
/*
- * in case it is enabled before, esp for kexec/kdump,
- * previous kernel already enable that. memset called
- * by allocate_aperture/__alloc_bootmem_nopanic cause restart.
- * or second kernel have different position for GART hole. and new
+ * In case it is enabled before, esp for kexec/kdump,
+ * previous kernel already enabled that. memset called
+ * by allocate_aperture/__alloc_bootmem_nopanic causes restart.
+ * Or second kernel could have different position for GART hole, and new
* kernel could use hole as RAM that is still used by GART set by
- * first kernel
- * or BIOS forget to put that in reserved.
- * try to update e820 to make that region as reserved.
+ * first kernel.
+ * Or maybe BIOS forgot to put that in reserved.
+ *
+ * Try to update e820 to make that region as reserved.
*/
int fix, slot;
u32 ctl;


--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/