2.6.9-rc1-mm2 compilation fixes

PATCH In review Bernhard Rosenkraenzer 2 participants 2 messages Sep 3, 2004 Kbuild

Share & tools

Bernhard Rosenkraenzer

author

2004-09-03 09:07 UTC #0 lore raw

PATCH 1/1 2.6.9-rc1-mm2 compilation fixes

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

scripts/Makefile.modinst renamed from scripts/Makefile.modinst.ark +1 -1

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

kernel/wait.c renamed from kernel/wait.c.ark +2 -2

@@ -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)
 {

Andrew Morton

2004-09-03 09:14 UTC #1 lore raw

Quoted 5 lines · Bernhard Rosenkraenzer

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.

Quoted 2 lines

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.