[PATCH] 2.6.9-rc1-mm2 compilation fixes

[PATCH] 2.6.9-rc1-mm2 compilation fixes

[Bernhard Rosenkraenzer]

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

make modules_install doesn't work if the ALSA korg1212 sound module is built - 
"grep -h .ko" will find /korg1212.o (. is a regexp character...), and 
therefore try to install the nonexistant korg1212.ko.
It should be grep -h '\.ko'

kernel/wait.c fails to compile with gcc 3.4 due to discrepancies between the 
prototype and implementations of __wait_on_bit() and __wait_on_bit_lock()

Fixes to both are attached.

LLaP
bero

[-- Attachment #2: linux-2.6.9-rc1-mm2-modules_install.patch --]
[-- Type: text/x-diff, Size: 439 bytes --]

--- linux-2.6.8/scripts/Makefile.modinst.ark	2004-09-03 08:46:43.000000000 +0200
+++ linux-2.6.8/scripts/Makefile.modinst	2004-09-03 08:47:15.000000000 +0200
@@ -9,7 +9,7 @@
 
 #
 
-__modules := $(sort $(shell grep -h .ko /dev/null $(wildcard $(MODVERDIR)/*.mod)))
+__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
 modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
 
 .PHONY: $(modules)

[-- Attachment #3: linux-2.6.9-rc1-mm2-gcc34.patch --]
[-- Type: text/x-diff, Size: 836 bytes --]

--- linux-2.6.8/kernel/wait.c.ark	2004-09-03 06:08:23.000000000 +0200
+++ linux-2.6.8/kernel/wait.c	2004-09-03 06:09:01.000000000 +0200
@@ -150,7 +150,7 @@
  * waiting, the actions of __wait_on_bit() and __wait_on_bit_lock() are
  * permitted return codes. Nonzero return codes halt waiting and return.
  */
-int __sched __wait_on_bit(wait_queue_head_t *wq, struct wait_bit_queue *q,
+int __sched fastcall __wait_on_bit(wait_queue_head_t *wq, struct wait_bit_queue *q,
 			void *word,
 			int bit, int (*action)(void *), unsigned mode)
 {
@@ -164,7 +164,7 @@
 }
 EXPORT_SYMBOL(__wait_on_bit);
 
-int __sched __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q,
+int __sched fastcall __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q,
 			void *word, int bit,
 			int (*action)(void *), unsigned mode)
 {

Re: [PATCH] 2.6.9-rc1-mm2 compilation fixes

[Andrew Morton]

Bernhard Rosenkraenzer <bero@arklinux.org> wrote:
>
> make modules_install doesn't work if the ALSA korg1212 sound module is built - 
> "grep -h .ko" will find /korg1212.o (. is a regexp character...), and 
> therefore try to install the nonexistant korg1212.ko.
> It should be grep -h '\.ko'

Yup.  This should be fixed in -mm3, thanks.

> kernel/wait.c fails to compile with gcc 3.4 due to discrepancies between the 
> prototype and implementations of __wait_on_bit() and __wait_on_bit_lock()

This also.