Re: 2.5isms

Pavel Machek
2004-01-03T15:17:13Z

Hi!

> It seems I've found another 2.5ism. 2.6.0, arch/i386/kernel/dmi_scan.c
> has
>
> #ifdef CONFIG_SIMNOW
> /*
> * Skip on x86/64 with simnow. Will eventually go away
> * If you see this ifdef in 2.6pre mail me !
> */
> return -1;
> #endif
>
> I don't know whose file this is ..
>
> Also, 2.6.0 still has the previously mentioned problem in
> include/asm/io.h.
>
> Not subscribed, CC me.

This is obsolete x86-64 code... Please apply,
Pavel

--- tmp/linux/arch/i386/kernel/dmi_scan.c 2004-01-03 16:12:43.000000000 +0100
+++ linux/arch/i386/kernel/dmi_scan.c 2004-01-03 16:12:17.000000000 +0100
@@ -108,15 +108,7 @@
u8 buf[15];
u32 fp=0xF0000;

-#ifdef CONFIG_SIMNOW
- /*
- * Skip on x86/64 with simnow. Will eventually go away
- * If you see this ifdef in 2.6pre mail me !
- */
- return -1;
-#endif
-
- while( fp < 0xFFFFF)
+ while (fp < 0xFFFFF)
{
isa_memcpy_fromio(buf, fp, 15);
if(memcmp(buf, "_DMI_", 5)==0 && dmi_checksum(buf))

--
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]