On 073, 03 14, 2005 at 06:05:54PM -0800, Andrew Morton wrote: > > You triggered my trivia twitch. > > Jason Davis 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) > > ? > > > /* > > 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? While you are looking at this code can you take a look at the attached trivial patch ? -- Andrey Panin | Linux and UNIX system administrator pazke@donpac.ru | PGP key: wwwkeys.pgp.net