2.6.9-rc1-mm4 : typo in include/linux/hardirq.h ?

2.6.9-rc1-mm4 : typo in include/linux/hardirq.h ?

[Eric Leblond]

Hi,

On my i386 computer, at line 5 of include/linux/hardirq.h we can read :
#ifdef CONFIG_PREEPT
It seems it should be
#ifdef CONFIG_PREEMPT

With this change, compilation of external driver like ndiswrapper works
again.

Please CC me as I've not subscribed to the list.

BR,
-- 
Eric Leblond <eric@inl.fr>
INL

Re: 2.6.9-rc1-mm4 : typo in include/linux/hardirq.h ?

[Gene Heskett]

On Saturday 11 September 2004 06:24, Eric Leblond wrote:
>Hi,
>
>On my i386 computer, at line 5 of include/linux/hardirq.h we can
> read : #ifdef CONFIG_PREEPT
>It seems it should be
>#ifdef CONFIG_PREEMPT
>
>With this change, compilation of external driver like ndiswrapper
> works again.
>
>Please CC me as I've not subscribed to the list.
>
>BR,

That prompted me to go take a look at my .config in that dir, but I'm 
correct.  Perhaps you have a nilmerg?

-- 
Cheers, Gene
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
99.26% setiathome rank, not too shabby for a WV hillbilly
Yahoo.com attorneys please note, additions to this message
by Gene Heskett are:
Copyright 2004 by Maurice Eugene Heskett, all rights reserved.

Re: 2.6.9-rc1-mm4 : typo in include/linux/hardirq.h ?

[Eric Leblond]

On Sat, 2004-09-11 at 12:41, Gene Heskett wrote:
> On Saturday 11 September 2004 06:24, Eric Leblond wrote:
> >Hi,
> >
> >On my i386 computer, at line 5 of include/linux/hardirq.h we can
> > read : #ifdef CONFIG_PREEPT
> 
> That prompted me to go take a look at my .config in that dir, but I'm 
> correct.  Perhaps you have a nilmerg?

I've looked at the mm diff :
http://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fpeople%2Fakpm%2Fpatches%2F2.6%2F2.6.9-rc1%2F2.6.9-rc1-mm4%2F2.6.9-rc1-mm4.bz2;z=2689

there's a trace of this problem...

I also get a kernel source from scratch, with the following command :
tar jxf linux-2.6.8.1.tar.bz2
cd linux-2.6.8.1
bunzip2 -c ~/patch-2.6.9-rc1.bz2 | patch -p1
bunzip2 -c ~/2.6.9-rc1-mm4.bz2 | patch -p1

the typo is at its place.

BR,
-- 
Eric Leblond <eric@regit.org>
NuFW, Now User Filtering Works : http://www.nufw.org

Re: 2.6.9-rc1-mm4 : typo in include/linux/hardirq.h ?

[Christian Kujau]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Eric Leblond wrote:
> Hi,
>
> On my i386 computer, at line 5 of include/linux/hardirq.h we can read :
> #ifdef CONFIG_PREEPT
> It seems it should be
> #ifdef CONFIG_PREEMPT
>
> With this change, compilation of external driver like ndiswrapper works
> again.

you can fix it by yourself or apply this diff:

- --- include/linux/hardirq.h    2004-09-11 13:32:53.000000000 +0200
+++ include/linux/hardirq.h.edited     2004-09-11 14:07:28.000000000 +0200
@@ -2,7 +2,7 @@
 #define LINUX_HARDIRQ_H

 #include <linux/config.h>
- -#ifdef CONFIG_PREEPT
+#ifdef CONFIG_PREEMPT
 #include <linux/smp_lock.h>
 #endif
 #include <asm/hardirq.h>
- --
BOFH excuse #262:

Our POP server was kidnapped by a weasel.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBQuud+A7rjkF8z0wRAvzRAJ9gNT1+hu98Fpsf3YukSmvgdIMYXQCfUWo6
NMbJ68B0aUpvh0MJ5wsrV5A=
=YFdG
-----END PGP SIGNATURE-----

Re: 2.6.9-rc1-mm4 : typo in include/linux/hardirq.h ?

[Christian Kujau]

[-- Attachment #1: Type: text/plain, Size: 730 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Eric Leblond wrote:
> Hi,
>
> On my i386 computer, at line 5 of include/linux/hardirq.h we can read :
> #ifdef CONFIG_PREEPT
> It seems it should be
> #ifdef CONFIG_PREEMPT
>
> With this change, compilation of external driver like ndiswrapper works
> again.

you can fix it by yourself or apply the attached diff (last mail was
scrambled by my MUA)

Christian.
- --
BOFH excuse #262:

Our POP server was kidnapped by a weasel.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBQux2+A7rjkF8z0wRAvGLAKC7OkQu1X7Lt7qsuQAG4Zn9Gs672gCgwKBM
4YjYQL/SpRSiHQS13GBjdc0=
=vz7P
-----END PGP SIGNATURE-----

[-- Attachment #2: hardirq.h_typo.diff --]
[-- Type: text/plain, Size: 313 bytes --]

--- include/linux/hardirq.h	2004-09-11 13:32:53.000000000 +0200
+++ include/linux/hardirq.h.edited	2004-09-11 14:07:28.000000000 +0200
@@ -2,7 +2,7 @@
 #define LINUX_HARDIRQ_H
 
 #include <linux/config.h>
-#ifdef CONFIG_PREEPT
+#ifdef CONFIG_PREEMPT
 #include <linux/smp_lock.h>
 #endif
 #include <asm/hardirq.h>