Re: [PATCH 10/10] x86 boot: add code to add BIOS provided EFImemory entries to kernel

[Ingo Molnar]

* Paul Jackson <pj@xxxxxxx> wrote:

> Ingo wrote:
> > so double-checking [the merge of my x86 boot patches] would be nice.
> 
> I only see one detail worth mentioning on reading the resulting merge 
> in ingo.tip.
> 
> Shouldn't the static array declarations in arch/x86/kernel/e820.c be 
> indented?  It looks like the -file- static declarations from 
> arch/x86/kernel/e820_32.c (which were not indented) took precedence in 
> the merge over the -function- static declarations from 
> arch/x86/kernel/e820_64.c.  The code, from the perspective of what 
> ends up in the compiled kernel, seems fine -- just the indentation 
> off.
> 
> int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,
> 				int *pnr_map)
> {
> 	struct change_member {
> 		struct e820entry *pbios; /* pointer to original bios entry */
> 		unsigned long long addr; /* address for this change point */
> 	};
> static struct change_member change_point_list[2*E820_X_MAX] __initdata;
> static struct change_member *change_point[2*E820_X_MAX] __initdata;
> static struct e820entry *overlap_list[E820_X_MAX] __initdata;
> static struct e820entry new_bios[E820_X_MAX] __initdata;
> 	struct change_member *change_tmp;
> 	unsigned long current_type, last_type;
> 	unsigned long long last_addr;

indeed that's quite off.

	Ingo
--
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/