Skip to contentSkip to conversation

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

DISCUSSION Eric Leblond 4 participants 5 messages Sep 11, 2004

lore
Share & tools
lore
#0 lore raw

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,

Signature · 2 lines
Eric Leblond <[email protected]>
INL
#1 lore raw
Quoted 7 lines · 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

Quoted 6 lines

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?

Signature · 8 lines
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.
#2 lore raw
Quoted 8 lines · Gene Heskett
Quoted 4 lines · Eric Leblond

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,

Signature · 2 lines
Eric Leblond <[email protected]>
NuFW, Now User Filtering Works : http://www.nufw.org
#3 lore raw
In reply to Eric Leblond

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

Quoted 9 lines · 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.

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

#4 lore raw
In reply to Eric Leblond

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

Quoted 9 lines · 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.

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

linux/hardirq.h.edited renamed from linux/hardirq.h +1 -1
@@ -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>