"Will be removed in 2.4"

"Will be removed in 2.4"

[Justin Pryzby]

Linux 2.4.21, include/asm/io.h:51 says "Will be removed in 2.4".  Its
there in 2.5.74 as well.

I can understand why it would be in 2.5; the comment should say 2.6,
though.

Justin

Re: "Will be removed in 2.4"

[Jeff Garzik]

Justin Pryzby wrote:
> Linux 2.4.21, include/asm/io.h:51 says "Will be removed in 2.4".  Its
> there in 2.5.74 as well.
> 
> I can understand why it would be in 2.5; the comment should say 2.6,
> though.


Actually there is a larger issue too:

I would love it if someone (kernel janitors?) went through the kernel 
code and dug out all the comments like this.  "should be gone by 1.3" :) 
  "should be removed in 2.5".  etc.  This should be a pretty easy, but 
time consuming job that even newbies could sink their teeth into.

Then we can go through the list and kill the issues, or the comments.

	Jeff

2.5isms

[Justin Pryzby]

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.

Justin

On Thu, Jul 03, 2003 at 01:01:34PM -0700, pryzbyj wrote:
> Linux 2.4.21, include/asm/io.h:51 says "Will be removed in 2.4".  Its
> there in 2.5.74 as well.
> 
> I can understand why it would be in 2.5; the comment should say 2.6,
> though.
> 
> Justin

Re: 2.5isms

[Pavel Machek]

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?]

Re: 2.5isms

[Justin Pryzby]

And again ;)

arch/i386/kernel/irq.c:
 * (mostly architecture independent, will move to kernel/irq.c in 2.5.)

Justin
On Tue, Dec 30, 2003 at 04:30:50PM -0500, pryzbyj wrote:
> 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.
> 
> Justin
> 
> On Thu, Jul 03, 2003 at 01:01:34PM -0700, pryzbyj wrote:
> > Linux 2.4.21, include/asm/io.h:51 says "Will be removed in 2.4".  Its
> > there in 2.5.74 as well.
> > 
> > I can understand why it would be in 2.5; the comment should say 2.6,
> > though.
> > 
> > Justin

Re: 2.5isms

[Pavel Machek]

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?]

Re: "Will be removed in 2.4"

[maximilian attems]

[-- Attachment #1.1: Type: text/plain, Size: 427 bytes --]


> I would love it if someone (kernel janitors?) went through the kernel 
> code and dug out all the comments like this.

grep -r ' [12]\.[0-9]' .|grep should > ~/comments.old
grep -r ' [12]\.[0-9]' .|grep remove >> ~/comments.old

this file has 85 lines for kernel 2.5.74
removed some occurence of firmware foo 1.1
still 63 occurences of this sort of comment
and attached the file for further work :)

a++ maks


[-- Attachment #1.2: comments.old --]
[-- Type: application/x-trash, Size: 5979 bytes --]

[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]