lkml.org 
[lkml]   [2004]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
From
Subject[PATCH] 2.6.9-rc1-mm2 compilation fixes
Date
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
--- 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)--- 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)
{
\
 
 \ /
  Last update: 2005-03-22 14:05    [W:0.084 / U:0.448 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site