Re: [PATCH] ES7000 Legacy Mappings Update
From: Jason Davis
Date: Tue Mar 15 2005 - 10:30:45 EST
See below.
On Mon, 14 Mar 2005, Andrew Morton wrote:
You triggered my trivia twitch.
Jason Davis <jason@xxxxxxxxxxxxxx> wrote:
- * ES7000 has no legacy identity mappings
+ * Older generations of ES7000 have no legacy identity mappings
*/
- if (es7000_plat)
+ if (es7000_plat && es7000_plat < 2)
return;
Why not
if (es7000_plat == 1)
?
Looks like I never learned to apply the concept of reducing fractions :). Thanks for catching this.
/*
diff -Naurp linux-2.6.11.3/arch/i386/mach-es7000/es7000plat.c linux-2.6.11.3-legacy/arch/i386/mach-es7000/es7000plat.c
--- linux-2.6.11.3/arch/i386/mach-es7000/es7000plat.c 2005-03-13 01:44:41.000000000 -0500
+++ linux-2.6.11.3-legacy/arch/i386/mach-es7000/es7000plat.c 2005-03-14 11:52:44.000000000 -0500
@@ -138,7 +138,14 @@ parse_unisys_oem (char *oemptr, int oem_
es7000_plat = 0;
} else {
printk("\nEnabling ES7000 specific features...\n");
- es7000_plat = 1;
+ /*
+ * Check to see if this is a x86_64 ES7000 machine.
+ */
+ if (!(boot_cpu_data.x86 <= 15 && boot_cpu_data.x86_model <= 2))
+ es7000_plat = 2;
+ else
+ es7000_plat = 1;
+
Perhaps some nice enumerated identifiers here, rather than magic numbers?
Initially, I was going to take this approach but that would require some specific platform defines to be thrown into a global header file (mpparse.c would need to see them as well). I didn't think it would be appropriate to mix code like that. I'll be glad to revise the patch to include enumerated identifiers but would it be more acceptable to comment on the semantics of the es7000_plat var in the platform specific "es7000plat.c" file?
-
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/