* Re: 2.6.8-rc1-mm1
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
@ 2004-07-14 7:29 ` Andrew Morton
2004-07-14 8:11 ` 2.6.8-rc1-mm1 David Howells
2004-07-14 16:36 ` 2.6.8-rc1-mm1 John Cherry
` (8 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Andrew Morton @ 2004-07-14 7:29 UTC (permalink / raw)
To: linux-kernel; +Cc: Jose R. Santos, David Howells
Andrew Morton <akpm@osdl.org> wrote:
>
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc1/2.6.8-rc1-mm1/
>
This kernel runs like a dessicated slug if you have more than 2G of memory
due to a 32-bit overflow.
Dentry cache hash table entries: 1 (order: -10, 4 bytes)
Inode-cache hash table entries: 1 (order: -10, 4 bytes)
The dcache is a singly-linked list. Here's a (lame) fix:
--- 25/mm/page_alloc.c~making-i-dhash_entries-cmdline-work-as-it-use-to-fix 2004-07-14 00:11:26.437028752 -0700
+++ 25-akpm/mm/page_alloc.c 2004-07-14 00:24:56.461886256 -0700
@@ -2004,7 +2004,8 @@ void *__init alloc_large_system_hash(con
unsigned int *_hash_shift,
unsigned int *_hash_mask)
{
- unsigned long max, log2qty, size;
+ unsigned long long max;
+ unsigned long log2qty, size;
void *table;
/* allow the kernel cmdline to have a say */
@@ -2025,18 +2026,19 @@ void *__init alloc_large_system_hash(con
numentries = 1UL << (long_log2(numentries) + 1);
/* limit allocation size to 1/16 total memory */
- max = ((nr_all_pages << PAGE_SHIFT)/16) / bucketsize;
+ max = ((unsigned long long)nr_all_pages << PAGE_SHIFT) >> 4;
+ do_div(max, bucketsize);
if (numentries > max)
numentries = max;
log2qty = long_log2(numentries);
+ size = bucketsize << log2qty;
do {
- size = bucketsize << log2qty;
-
- table = (void *) alloc_bootmem(size);
-
+ table = alloc_bootmem(size);
+ if (!table)
+ size /= 2;
} while (!table && size > PAGE_SIZE);
if (!table)
_
btw, David, I'm wondering about this loop:
do {
size = bucketsize << log2qty;
table = (void *) alloc_bootmem(size);
} while (!table && size > PAGE_SIZE);
Is this a busy-wait-until-someone-plugs-in-more-ram-chips thing? ;)
I assume you meant something like the above?
btw, that (void *) cast was superfluous...
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: 2.6.8-rc1-mm1
2004-07-14 7:29 ` 2.6.8-rc1-mm1 Andrew Morton
@ 2004-07-14 8:11 ` David Howells
0 siblings, 0 replies; 18+ messages in thread
From: David Howells @ 2004-07-14 8:11 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Jose R. Santos
> btw, David, I'm wondering about this loop:
>
> do {
> size = bucketsize << log2qty;
>
> table = (void *) alloc_bootmem(size);
>
> } while (!table && size > PAGE_SIZE);
>
> Is this a busy-wait-until-someone-plugs-in-more-ram-chips thing? ;)
Well, with IBM hardware, you never know:-)
Yeah... that got fixed here in my 2.4 version, and I failed to transfer the
fix across. log2qty should be decremented every time around the loop:
- } while (!table && size > PAGE_SIZE);
+ } while (!table && size > PAGE_SIZE && --log2qty);
David
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: 2.6.8-rc1-mm1
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
2004-07-14 7:29 ` 2.6.8-rc1-mm1 Andrew Morton
@ 2004-07-14 16:36 ` John Cherry
2004-07-14 18:49 ` [patch] 2.6.8-rc1-mm1: USB w9968cf compile error Adrian Bunk
` (7 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: John Cherry @ 2004-07-14 16:36 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel@vger.kernel.org
The errors in the allyesconfig build stem from the following error...
sound/pci/au88x0/snd-au8830.o(.rodata+0x45c): In function
`vortex_wt_SetReg':
sound/pci/au88x0/au88x0_synth.c:237: multiple definition of
`vortex_asXtalkGainsAllChan'
sound/pci/au88x0/snd-au8810.o(.rodata+0x43c):sound/pci/au88x0/au88x0_core.c:344: first defined here
make[3]: [sound/pci/au88x0/built-in.o] Error 1 (ignored)
Linux 2.6 (mm tree) Compile Statistics (gcc 3.2.2)
Kernel bzImage bzImage bzImage modules bzImage modules
(defconfig) (allno) (allyes) (allyes) (allmod) (allmod)
--------------- ---------- -------- -------- -------- -------- --------
2.6.8-rc1-mm1 0w/0e 0w/0e 88w/9e 5w/0e 1w/0e 87w/0e
2.6.7-mm7 0w/0e 0w/0e 89w/9e 5w/0e 1w/0e 84w/0e
2.6.7-mm6 0w/0e 0w/0e 85w/9e 5w/0e 1w/0e 80w/0e
2.6.7-mm5 0w/0e 0w/0e 92w/0e 5w/0e 1w/0e 87w/0e
2.6.7-mm4 0w/0e 0w/0e 94w/0e 5w/0e 1w/0e 89w/0e
2.6.7-mm3 0w/0e 0w/0e 90w/6e 5w/0e 1w/0e 86w/0e
2.6.7-mm2 0w/0e 0w/0e 109w/0e 7w/0e 1w/0e 106w/0e
2.6.7-mm1 0w/0e 5w/0e 108w/0e 5w/0e 1w/0e 104w/0e
2.6.7-rc3-mm2 0w/0e 5w/0e 105w/10e 5w/0e 2w/0e 100w/2e
2.6.7-rc3-mm1 0w/0e 5w/0e 104w/10e 5w/0e 2w/0e 100w/2e
2.6.7-rc2-mm2 0w/0e 5w/0e 109w/10e 5w/0e 2w/0e 105w/2e
2.6.7-rc2-mm1 0w/0e 12w/0e 158w/13e 5w/0e 3w/0e 153w/4e
2.6.7-rc1-mm1 0w/0e 6w/0e 108w/0e 5w/0e 2w/0e 104w/0e
2.6.6-mm5 0w/0e 0w/0e 109w/5e 5w/0e 2w/0e 110w/0e
2.6.6-mm4 0w/0e 0w/0e 112w/9e 5w/0e 2w/5e 106w/1e
2.6.6-mm3 3w/9e 0w/0e 120w/26e 5w/0e 2w/0e 114w/10e
2.6.6-mm2 4w/11e 0w/0e 120w/24e 6w/0e 2w/0e 118w/9e
2.6.6-mm1 1w/0e 0w/0e 118w/25e 6w/0e 2w/0e 114w/10e
2.6.6-rc3-mm2 0w/0e 0w/0e 117w/ 0e 8w/0e 2w/0e 116w/0e
2.6.6-rc3-mm1 0w/0e 0w/0e 120w/10e 8w/0e 2w/0e 152w/2e
2.6.6-rc2-mm2 0w/0e 1w/5e 118w/ 0e 8w/0e 3w/0e 118w/0e
2.6.6-rc2-mm1 0w/0e 0w/0e 115w/ 0e 7w/0e 3w/0e 116w/0e
2.6.6-rc1-mm1 0w/0e 0w/7e 122w/ 0e 7w/0e 4w/0e 122w/0e
2.6.5-mm6 0w/0e 0w/0e 123w/ 0e 7w/0e 4w/0e 124w/0e
2.6.5-mm5 0w/0e 0w/0e 119w/ 0e 7w/0e 4w/0e 120w/0e
2.6.5-mm4 0w/0e 0w/0e 120w/ 0e 7w/0e 4w/0e 121w/0e
2.6.5-mm3 0w/0e 1w/0e 121w/12e 7w/0e 3w/0e 123w/0e
2.6.5-mm2 0w/0e 0w/0e 128w/12e 7w/0e 3w/0e 134w/0e
2.6.5-mm1 0w/0e 5w/0e 122w/ 0e 7w/0e 3w/0e 124w/0e
2.6.5-rc3-mm4 0w/0e 0w/0e 124w/ 0e 8w/0e 4w/0e 126w/0e
2.6.5-rc3-mm3 0w/0e 5w/0e 129w/14e 8w/0e 4w/0e 129w/6e
2.6.5-rc3-mm2 0w/0e 5w/0e 130w/14e 8w/0e 4w/0e 129w/6e
2.6.5-rc3-mm1 0w/0e 5w/0e 129w/ 0e 8w/0e 4w/0e 129w/0e
2.6.5-rc2-mm5 0w/0e 5w/0e 130w/ 0e 8w/0e 4w/0e 129w/0e
2.6.5-rc2-mm4 0w/0e 5w/0e 134w/ 0e 8w/0e 3w/0e 133w/0e
2.6.5-rc2-mm3 0w/0e 5w/0e 134w/ 0e 8w/0e 3w/0e 133w/0e
2.6.5-rc2-mm2 0w/0e 5w/0e 137w/ 0e 8w/0e 3w/0e 134w/0e
2.6.5-rc2-mm1 0w/0e 5w/0e 136w/ 0e 8w/0e 3w/0e 134w/0e
2.6.5-rc1-mm2 0w/0e 5w/0e 135w/ 5e 8w/0e 3w/0e 133w/0e
2.6.5-rc1-mm1 0w/0e 5w/0e 135w/ 5e 8w/0e 3w/0e 133w/0e
2.6.4-mm2 1w/2e 5w/2e 144w/10e 8w/0e 3w/2e 144w/0e
2.6.4-mm1 1w/0e 5w/0e 146w/ 5e 8w/0e 3w/0e 144w/0e
2.6.4-rc2-mm1 1w/0e 5w/0e 146w/12e 11w/0e 3w/0e 147w/2e
2.6.4-rc1-mm2 1w/0e 5w/0e 144w/ 0e 11w/0e 3w/0e 145w/0e
2.6.4-rc1-mm1 1w/0e 5w/0e 147w/ 5e 11w/0e 3w/0e 147w/0e
2.6.3-mm4 1w/0e 5w/0e 146w/ 0e 7w/0e 3w/0e 142w/0e
2.6.3-mm3 1w/2e 5w/2e 146w/15e 7w/0e 3w/2e 144w/5e
2.6.3-mm2 1w/8e 5w/0e 140w/ 0e 7w/0e 3w/0e 138w/0e
2.6.3-mm1 1w/0e 5w/0e 143w/ 5e 7w/0e 3w/0e 141w/0e
2.6.3-rc3-mm1 1w/0e 0w/0e 144w/13e 7w/0e 3w/0e 142w/3e
2.6.3-rc2-mm1 1w/0e 0w/265e 144w/ 5e 7w/0e 3w/0e 145w/0e
2.6.3-rc1-mm1 1w/0e 0w/265e 141w/ 5e 7w/0e 3w/0e 143w/0e
2.6.2-mm1 2w/0e 0w/264e 147w/ 5e 7w/0e 3w/0e 173w/0e
2.6.2-rc3-mm1 2w/0e 0w/265e 146w/ 5e 7w/0e 3w/0e 172w/0e
2.6.2-rc2-mm2 0w/0e 0w/264e 145w/ 5e 7w/0e 3w/0e 171w/0e
2.6.2-rc2-mm1 0w/0e 0w/264e 146w/ 5e 7w/0e 3w/0e 172w/0e
2.6.2-rc1-mm3 0w/0e 0w/265e 144w/ 8e 7w/0e 3w/0e 169w/0e
2.6.2-rc1-mm2 0w/0e 0w/264e 144w/ 5e 10w/0e 3w/0e 171w/0e
2.6.2-rc1-mm1 0w/0e 0w/264e 144w/ 5e 10w/0e 3w/0e 171w/0e
2.6.1-mm5 2w/5e 0w/264e 153w/11e 10w/0e 3w/0e 180w/0e
2.6.1-mm4 0w/821e 0w/264e 154w/ 5e 8w/1e 5w/0e 179w/0e
2.6.1-mm3 0w/0e 0w/0e 151w/ 5e 10w/0e 3w/0e 177w/0e
2.6.1-mm2 0w/0e 0w/0e 143w/ 5e 12w/0e 3w/0e 171w/0e
2.6.1-mm1 0w/0e 0w/0e 146w/ 9e 12w/0e 6w/0e 171w/0e
2.6.1-rc2-mm1 0w/0e 0w/0e 149w/ 0e 12w/0e 6w/0e 171w/4e
2.6.1-rc1-mm2 0w/0e 0w/0e 157w/15e 12w/0e 3w/0e 185w/4e
2.6.1-rc1-mm1 0w/0e 0w/0e 156w/10e 12w/0e 3w/0e 184w/2e
2.6.0-mm2 0w/0e 0w/0e 161w/ 0e 12w/0e 3w/0e 189w/0e
2.6.0-mm1 0w/0e 0w/0e 173w/ 0e 12w/0e 3w/0e 212w/0e
Web page with links to complete details:
http://developer.osdl.org/cherry/compile/
John
^ permalink raw reply [flat|nested] 18+ messages in thread* [patch] 2.6.8-rc1-mm1: USB w9968cf compile error
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
2004-07-14 7:29 ` 2.6.8-rc1-mm1 Andrew Morton
2004-07-14 16:36 ` 2.6.8-rc1-mm1 John Cherry
@ 2004-07-14 18:49 ` Adrian Bunk
2004-07-14 19:03 ` Greg KH
2004-07-14 19:08 ` Adrian Bunk
2004-07-14 20:29 ` 2.6.8-rc1-mm1 Dominik Karall
` (6 subsequent siblings)
9 siblings, 2 replies; 18+ messages in thread
From: Adrian Bunk @ 2004-07-14 18:49 UTC (permalink / raw)
To: Andrew Morton, Luca Risolia; +Cc: linux-kernel, greg, linux-usb-devel
On Tue, Jul 13, 2004 at 06:25:59PM -0700, Andrew Morton wrote:
>...
> All 252 patches:
>...
> bk-usb.patch
>...
This patch marks w9968cf_valid_depth as inline, although it's used
before it's defined.
gcc 3.4 therefore correctly fails with:
<-- snip -->
...
CC drivers/usb/media/w9968cf.o
drivers/usb/media/w9968cf.c: In function `w9968cf_set_picture':
drivers/usb/media/w9968cf.c:487: sorry, unimplemented: inlining failed
in call to 'w9968cf_valid_depth': function body not available
drivers/usb/media/w9968cf.c:1722: sorry, unimplemented: called from here
make[3]: *** [drivers/usb/media/w9968cf.o] Error 1
<-- snip -->
This patch moves w9968cf_valid_depth above it's first user (it also uses
two other functions to keep the ordering of functions a bit more
consistent).
diffstat output:
drivers/usb/media/w9968cf.c | 92 ++++++++++++++++++------------------
1 files changed, 46 insertions(+), 46 deletions(-)
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.6.8-rc1-mm1-full-3.4/drivers/usb/media/w9968cf.c.old 2004-07-14 20:31:39.000000000 +0200
+++ linux-2.6.8-rc1-mm1-full-3.4/drivers/usb/media/w9968cf.c 2004-07-14 20:42:52.000000000 +0200
@@ -481,11 +481,11 @@
static void w9968cf_adjust_configuration(struct w9968cf_device*);
static int w9968cf_turn_on_led(struct w9968cf_device*);
static int w9968cf_init_chip(struct w9968cf_device*);
-static int w9968cf_set_picture(struct w9968cf_device*, struct video_picture);
-static int w9968cf_set_window(struct w9968cf_device*, struct video_window);
static inline u16 w9968cf_valid_palette(u16 palette);
static inline u16 w9968cf_valid_depth(u16 palette);
static inline u8 w9968cf_need_decompression(u16 palette);
+static int w9968cf_set_picture(struct w9968cf_device*, struct video_picture);
+static int w9968cf_set_window(struct w9968cf_device*, struct video_window);
static int w9968cf_postprocess_frame(struct w9968cf_device*,
struct w9968cf_frame_t*);
static int w9968cf_adjust_window_size(struct w9968cf_device*, u16* w, u16* h);
@@ -1709,6 +1709,50 @@
/*--------------------------------------------------------------------------
+ Return non-zero if the palette is supported, 0 otherwise.
+ --------------------------------------------------------------------------*/
+static inline u16 w9968cf_valid_palette(u16 palette)
+{
+ u8 i = 0;
+ while (w9968cf_formatlist[i].palette != 0) {
+ if (palette == w9968cf_formatlist[i].palette)
+ return palette;
+ i++;
+ }
+ return 0;
+}
+
+
+/*--------------------------------------------------------------------------
+ Return the depth corresponding to the given palette.
+ Palette _must_ be supported !
+ --------------------------------------------------------------------------*/
+static inline u16 w9968cf_valid_depth(u16 palette)
+{
+ u8 i=0;
+ while (w9968cf_formatlist[i].palette != palette)
+ i++;
+
+ return w9968cf_formatlist[i].depth;
+}
+
+
+/*--------------------------------------------------------------------------
+ Return non-zero if the format requires decompression, 0 otherwise.
+ --------------------------------------------------------------------------*/
+static inline u8 w9968cf_need_decompression(u16 palette)
+{
+ u8 i = 0;
+ while (w9968cf_formatlist[i].palette != 0) {
+ if (palette == w9968cf_formatlist[i].palette)
+ return w9968cf_formatlist[i].compression;
+ i++;
+ }
+ return 0;
+}
+
+
+/*--------------------------------------------------------------------------
Change the picture settings of the camera.
Return 0 on success, a negative number otherwise.
--------------------------------------------------------------------------*/
@@ -1966,50 +2010,6 @@
}
-/*--------------------------------------------------------------------------
- Return non-zero if the palette is supported, 0 otherwise.
- --------------------------------------------------------------------------*/
-static inline u16 w9968cf_valid_palette(u16 palette)
-{
- u8 i = 0;
- while (w9968cf_formatlist[i].palette != 0) {
- if (palette == w9968cf_formatlist[i].palette)
- return palette;
- i++;
- }
- return 0;
-}
-
-
-/*--------------------------------------------------------------------------
- Return the depth corresponding to the given palette.
- Palette _must_ be supported !
- --------------------------------------------------------------------------*/
-static inline u16 w9968cf_valid_depth(u16 palette)
-{
- u8 i=0;
- while (w9968cf_formatlist[i].palette != palette)
- i++;
-
- return w9968cf_formatlist[i].depth;
-}
-
-
-/*--------------------------------------------------------------------------
- Return non-zero if the format requires decompression, 0 otherwise.
- --------------------------------------------------------------------------*/
-static inline u8 w9968cf_need_decompression(u16 palette)
-{
- u8 i = 0;
- while (w9968cf_formatlist[i].palette != 0) {
- if (palette == w9968cf_formatlist[i].palette)
- return w9968cf_formatlist[i].compression;
- i++;
- }
- return 0;
-}
-
-
/*--------------------------------------------------------------------------
Adjust the asked values for window width and height.
Return 0 on success, -1 otherwise.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [patch] 2.6.8-rc1-mm1: USB w9968cf compile error
2004-07-14 18:49 ` [patch] 2.6.8-rc1-mm1: USB w9968cf compile error Adrian Bunk
@ 2004-07-14 19:03 ` Greg KH
2004-07-14 19:08 ` Adrian Bunk
1 sibling, 0 replies; 18+ messages in thread
From: Greg KH @ 2004-07-14 19:03 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, Luca Risolia, linux-kernel, linux-usb-devel
On Wed, Jul 14, 2004 at 08:49:53PM +0200, Adrian Bunk wrote:
> On Tue, Jul 13, 2004 at 06:25:59PM -0700, Andrew Morton wrote:
> >...
> > All 252 patches:
> >...
> > bk-usb.patch
> >...
>
> This patch marks w9968cf_valid_depth as inline, although it's used
> before it's defined.
Looks good, applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [patch] 2.6.8-rc1-mm1: USB w9968cf compile error
2004-07-14 18:49 ` [patch] 2.6.8-rc1-mm1: USB w9968cf compile error Adrian Bunk
2004-07-14 19:03 ` Greg KH
@ 2004-07-14 19:08 ` Adrian Bunk
1 sibling, 0 replies; 18+ messages in thread
From: Adrian Bunk @ 2004-07-14 19:08 UTC (permalink / raw)
To: Andrew Morton, Luca Risolia; +Cc: linux-kernel, greg, linux-usb-devel
On Wed, Jul 14, 2004 at 08:49:53PM +0200, Adrian Bunk wrote:
>...
> This patch moves w9968cf_valid_depth above it's first user (it also uses
s/uses/moves/
> two other functions to keep the ordering of functions a bit more
> consistent).
>...
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: 2.6.8-rc1-mm1
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
` (2 preceding siblings ...)
2004-07-14 18:49 ` [patch] 2.6.8-rc1-mm1: USB w9968cf compile error Adrian Bunk
@ 2004-07-14 20:29 ` Dominik Karall
2004-07-14 20:43 ` [patch] 2.6.8-rc1-mm1: 8139too: uninline rtl8139_start_thread Adrian Bunk
2004-07-14 21:08 ` 2.6.8-rc1-mm1 Dominik Karall
` (5 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Dominik Karall @ 2004-07-14 20:29 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
On Wednesday 14 July 2004 03:25, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc1/2.6
>.8-rc1-mm1/
CC [M] drivers/net/8139too.o
drivers/net/8139too.c: In function `rtl8139_open':
drivers/net/8139too.c:616: nicht implementiert: >>inline<< beim Aufruf von
>>rtl8139_start_thread<< gescheitert: function body not available
drivers/net/8139too.c:1362: nicht implementiert: von hier aufgerufen
make[3]: *** [drivers/net/8139too.o] Fehler 1
make[2]: *** [drivers/net] Fehler 2
make[1]: *** [drivers] Fehler 2
make[1]: Verlasse Verzeichnis »/usr/src/linux-2.6.6«
make: *** [stamp-build] Fehler 2
gcc 3.4
greets
dominik
^ permalink raw reply [flat|nested] 18+ messages in thread* [patch] 2.6.8-rc1-mm1: 8139too: uninline rtl8139_start_thread
2004-07-14 20:29 ` 2.6.8-rc1-mm1 Dominik Karall
@ 2004-07-14 20:43 ` Adrian Bunk
2004-07-14 20:45 ` Jeff Garzik
2004-07-27 18:00 ` Jeff Garzik
0 siblings, 2 replies; 18+ messages in thread
From: Adrian Bunk @ 2004-07-14 20:43 UTC (permalink / raw)
To: Dominik Karall, Jeff Garzik; +Cc: Andrew Morton, linux-kernel, linux-net
On Wed, Jul 14, 2004 at 10:29:18PM +0200, Dominik Karall wrote:
> On Wednesday 14 July 2004 03:25, Andrew Morton wrote:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc1/2.6
> >.8-rc1-mm1/
>
> CC [M] drivers/net/8139too.o
> drivers/net/8139too.c: In function `rtl8139_open':
> drivers/net/8139too.c:616: nicht implementiert: >>inline<< beim Aufruf von
> >>rtl8139_start_thread<< gescheitert: function body not available
> drivers/net/8139too.c:1362: nicht implementiert: von hier aufgerufen
> make[3]: *** [drivers/net/8139too.o] Fehler 1
> make[2]: *** [drivers/net] Fehler 2
> make[1]: *** [drivers] Fehler 2
> make[1]: Verlasse Verzeichnis »/usr/src/linux-2.6.6«
> make: *** [stamp-build] Fehler 2
>
> gcc 3.4
I should be fast at going through my gcc 3.4 TODO list...
Fix below.
> greets
> dominik
cu
Adrian
<-- snip -->
uninline rtl8139_start_thread in drivers/net/8139too.c .
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.6.7-mm6-full-gcc3.4/drivers/net/8139too.c.old 2004-07-09 00:49:24.000000000 +0200
+++ linux-2.6.7-mm6-full-gcc3.4/drivers/net/8139too.c 2004-07-09 00:52:55.000000000 +0200
@@ -613,7 +613,7 @@
static int mdio_read (struct net_device *dev, int phy_id, int location);
static void mdio_write (struct net_device *dev, int phy_id, int location,
int val);
-static inline void rtl8139_start_thread(struct net_device *dev);
+static void rtl8139_start_thread(struct net_device *dev);
static void rtl8139_tx_timeout (struct net_device *dev);
static void rtl8139_init_ring (struct net_device *dev);
static int rtl8139_start_xmit (struct sk_buff *skb,
@@ -1643,7 +1643,7 @@
complete_and_exit (&tp->thr_exited, 0);
}
-static inline void rtl8139_start_thread(struct net_device *dev)
+static void rtl8139_start_thread(struct net_device *dev)
{
struct rtl8139_private *tp = dev->priv;
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: 2.6.8-rc1-mm1
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
` (3 preceding siblings ...)
2004-07-14 20:29 ` 2.6.8-rc1-mm1 Dominik Karall
@ 2004-07-14 21:08 ` Dominik Karall
2004-07-14 21:53 ` 2.6.8-rc1-mm1 Tim Bird
` (4 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Dominik Karall @ 2004-07-14 21:08 UTC (permalink / raw)
To: Andrew Morton, Adrian Bunk, Jeff Garzik; +Cc: linux-kernel
On Wednesday 14 July 2004 03:25, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc1/2.6
>.8-rc1-mm1/
next one:
CC [M] drivers/scsi/sg.o
drivers/scsi/sg.c: In function `sg_ioctl':
drivers/scsi/sg.c:209: nicht implementiert: >>inline<< beim Aufruf von
>>sg_jif_to_ms<< gescheitert: function body not available
drivers/scsi/sg.c:930: nicht implementiert: von hier aufgerufen
make[3]: *** [drivers/scsi/sg.o] Fehler 1
make[2]: *** [drivers/scsi] Fehler 2
make[1]: *** [drivers] Fehler 2
greets
dominik
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: 2.6.8-rc1-mm1
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
` (4 preceding siblings ...)
2004-07-14 21:08 ` 2.6.8-rc1-mm1 Dominik Karall
@ 2004-07-14 21:53 ` Tim Bird
2004-07-15 10:35 ` 2.6.8-rc1-mm1 Ralf Hildebrandt
` (3 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Tim Bird @ 2004-07-14 21:53 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
Andrew Morton wrote:
> +preset-loops_per_jiffy-for-faster-booting.patch
>
> Add the "lpj=" kernel boot option
I tested this...
With HZ=1000:
- normal boot: calibrate_delay() took 23 milliseconds
- specifying lpj=xxx: calibrate_delay() took 43 microseconds.
With HZ=100:
- normal boot: calibrate_delay() took 264 milliseconds
- specifying lpj=xxx: calibrate_delay() took 43 microseconds.
No adverse behaviour was observed.
This will be a big improvement for embedded folks.
Thanks,
-- Tim
=============================
Tim Bird
Architecture Group Co-Chair, CE Linux Forum
Senior Staff Engineer, Sony Electronics
E-mail: tim.bird@am.sony.com
=============================
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: 2.6.8-rc1-mm1
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
` (5 preceding siblings ...)
2004-07-14 21:53 ` 2.6.8-rc1-mm1 Tim Bird
@ 2004-07-15 10:35 ` Ralf Hildebrandt
2004-07-18 3:53 ` [patch] 2.6.8-rc1-mm1: work around broken USB DocBook generation Adrian Bunk
` (2 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Ralf Hildebrandt @ 2004-07-15 10:35 UTC (permalink / raw)
To: linux-kernel
* Andrew Morton <akpm@osdl.org>:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc1/2.6.8-rc1-mm1/
>
> - Lots of little fixes, mainly
>
> - Numerous scheduling latency fixes, mainly in the ext3 area.
>
> This is a first pass - these patches need redoing and a bit of
> infrastructure consolidation.
>
> - Outta here: I won't be in a position to handle patches until July 26. Off
> to http://www.tech-forum.org/upcoming/open_source_software_06-10-04.htm and
> then Kernel Summit and then OLS.
With gcc-3.4 I get:
make[1]: Entering directory /usr/src/linux-2.6.8-rc1-mm1'
make[2]: arch/i386/kernel/asm-offsets.s' is up to date.
CHK include/linux/compile.h
CC drivers/net/8139too.o
drivers/net/8139too.c: In function rtl8139_open':
drivers/net/8139too.c:616: sorry, unimplemented: inlining failed
in call to 'rtl8139_start_thread': function body not available
drivers/net/8139too.c:1362: sorry, unimplemented: called from here
make[3]: *** [drivers/net/8139too.o] Error 1
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
make[1]: Leaving directory /usr/src/linux-2.6.8-rc1-mm1'
make: *** [stamp-build] Error 2
--
Ralf Hildebrandt (Im Auftrag des Referat V a) Ralf.Hildebrandt@charite.de
Charite - Universitätsmedizin Berlin Tel. +49 (0)30-450 570-155
Gemeinsame Einrichtung von FU- und HU-Berlin Fax. +49 (0)30-450 570-916
IT-Zentrum Standort Campus Mitte AIM. ralfpostfix
^ permalink raw reply [flat|nested] 18+ messages in thread* [patch] 2.6.8-rc1-mm1: work around broken USB DocBook generation
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
` (6 preceding siblings ...)
2004-07-15 10:35 ` 2.6.8-rc1-mm1 Ralf Hildebrandt
@ 2004-07-18 3:53 ` Adrian Bunk
2004-07-20 0:02 ` 2.6.8-rc1-mm1 J.A. Magallon
2004-07-20 0:05 ` 2.6.8-rc1-mm1 J.A. Magallon
9 siblings, 0 replies; 18+ messages in thread
From: Adrian Bunk @ 2004-07-18 3:53 UTC (permalink / raw)
To: Andrew Morton, greg; +Cc: linux-kernel, linux-usb-devel
On Tue, Jul 13, 2004 at 06:25:59PM -0700, Andrew Morton wrote:
>...
> All 252 patches:
>...
> bk-usb.patch
>...
This causes the following error during "make psdocs":
<-- snip -->
...
DB2PS Documentation/DocBook/usb.ps
Using catalogs: /etc/sgml/catalog
Using stylesheet: /usr/share/docbook-utils/docbook-utils.dsl#print
Working on:
/home/bunk/linux/kernel-2.6/linux-2.6.8-rc1-mm1-full/Documentation/DocBook/usb.sgml
jade:/home/bunk/linux/kernel-2.6/linux-2.6.8-rc1-mm1-full/Documentation/DocBook/usb.sgml:549:16:E:
end tag for "VARIABLELIST" which is not finished
make[1]: *** [Documentation/DocBook/usb.ps] Error 8
<-- snip -->
The patch below works around this issue by not letting it look like a
valid kerneldoc.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
--- linux-2.6.8-rc1-mm1-full/include/linux/usb.h.old 2004-07-18 05:47:38.000000000 +0200
+++ linux-2.6.8-rc1-mm1-full/include/linux/usb.h 2004-07-18 05:47:51.000000000 +0200
@@ -289,7 +289,7 @@
struct usb_tt;
-/**
+/*
* struct usb_device - kernel's representation of a USB device
*
* FIXME: Write the kerneldoc!
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: 2.6.8-rc1-mm1
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
` (7 preceding siblings ...)
2004-07-18 3:53 ` [patch] 2.6.8-rc1-mm1: work around broken USB DocBook generation Adrian Bunk
@ 2004-07-20 0:02 ` J.A. Magallon
2004-07-22 12:56 ` 2.6.8-rc1-mm1 Jens Axboe
2004-07-20 0:05 ` 2.6.8-rc1-mm1 J.A. Magallon
9 siblings, 1 reply; 18+ messages in thread
From: J.A. Magallon @ 2004-07-20 0:02 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 6156 bytes --]
On 2004.07.14, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc1/2.6.8-rc1-mm1/
>
It oopses if you try to write on a CDRW without media loaded. Who would do
such a stupid thing ? Me the impatient trying to write before the drive ends
to load the disc...
The bad thing is that it leaves the drive in an ususable state:
Error trying to open /dev/hdc exclusively (Device or resource busy)... retrying in 1 second.
Error trying to open /dev/hdc exclusively (Device or resource busy)... retrying in 1 second.
It does not happen with 2.6.8-rc2. I am not using a pure rc1-mm1, but applied
all the patches neded to build with gcc-3.4.1:
- fix for usb-locking
- sg.c changes to use standard jiffies
- inline corrections from Adrian Bunk for e1000, smp, sunrpc, eth1394.
Yup, nvidia loaded, but does it really matter ?
Opps follows:
Jul 20 01:52:35 werewolf kernel: ------------[ cut here ]------------
Jul 20 01:52:35 werewolf kernel: kernel BUG at mm/page_alloc.c:796!
Jul 20 01:52:35 werewolf kernel: invalid operand: 0000 [#1]
Jul 20 01:52:35 werewolf kernel: PREEMPT SMP
Jul 20 01:52:35 werewolf kernel: Modules linked in: microcode snd_pcm_oss snd_mixer_oss tuner msp3400 bttv video_buf i2c_algo_bit v4l2_common btcx
_risc videodev nvidia snd_intel8x0 snd_ac97_codec snd_pcm snd_timer snd_page_alloc snd_mpu401_uart snd_rawmidi snd soundcore w83627hf i2c_sensor i
2c_isa i2c_i801 i2c_core ipt_MASQUERADE iptable_nat ipt_state ip_conntrack iptable_filter ip_tables e1000 ide_floppy ide_cd 3c59x intel_agp agpgar
t joydev evdev usb_storage usblp usbhid uhci_hcd ehci_hcd usbcore
Jul 20 01:52:35 werewolf kernel: CPU: 0
Jul 20 01:52:35 werewolf kernel: EIP: 0060:[__free_pages+48/58] Tainted: P VLI
Jul 20 01:52:35 werewolf kernel: EIP: 0060:[<c013c916>] Tainted: P VLI
Jul 20 01:52:35 werewolf kernel: EFLAGS: 00210246 (2.6.8-rc1-mm1)
Jul 20 01:52:35 werewolf kernel: EIP is at __free_pages+0x30/0x3a
Jul 20 01:52:35 werewolf kernel: eax: ffffffff ebx: f7667f60 ecx: c15f6c40 edx: 00000000
Jul 20 01:52:35 werewolf kernel: esi: f1dff740 edi: f7448a40 ebp: 00000001 esp: f2351d6c
Jul 20 01:52:35 werewolf kernel: ds: 007b es: 007b ss: 0068
Jul 20 01:52:35 werewolf kernel: Process cdrecord (pid: 4889, threadinfo=f2351000 task=f23d7970)
Jul 20 01:52:35 werewolf kernel: Stack: c015c930 fffffff2 f740b9cc 00000000 f2351e1c f740b9cc c0228603 f2351ea8
Jul 20 01:52:35 werewolf kernel: 00029b05 c022bd3c 00000040 00000001 00000000 f7448a40 f7e4bd80 f7dcf94c
Jul 20 01:52:35 werewolf kernel: 0005005a 00000000 c0130040 0002eb5f 00000000 00000000 00000000 00000000
Jul 20 01:52:35 werewolf kernel: Call Trace:
Jul 20 01:52:35 werewolf kernel: [bio_uncopy_user+94/125] bio_uncopy_user+0x5e/0x7d
Jul 20 01:52:35 werewolf kernel: [<c015c930>] bio_uncopy_user+0x5e/0x7d
Jul 20 01:52:35 werewolf kernel: [blk_rq_unmap_user+31/80] blk_rq_unmap_user+0x1f/0x50
Jul 20 01:52:35 werewolf kernel: [<c0228603>] blk_rq_unmap_user+0x1f/0x50
Jul 20 01:52:35 werewolf kernel: [sg_io+550/633] sg_io+0x226/0x279
Jul 20 01:52:35 werewolf kernel: [<c022bd3c>] sg_io+0x226/0x279
Jul 20 01:52:35 werewolf kernel: [sys_timer_settime+602/637] sys_timer_settime+0x25a/0x27d
Jul 20 01:52:35 werewolf kernel: [<c0130040>] sys_timer_settime+0x25a/0x27d
Jul 20 01:52:35 werewolf kernel: [scsi_cmd_ioctl+737/993] scsi_cmd_ioctl+0x2e1/0x3e1
Jul 20 01:52:35 werewolf kernel: [<c022c2f8>] scsi_cmd_ioctl+0x2e1/0x3e1
Jul 20 01:52:35 werewolf kernel: [pty_write+297/321] pty_write+0x129/0x141
Jul 20 01:52:35 werewolf kernel: [<c020d483>] pty_write+0x129/0x141
Jul 20 01:52:35 werewolf kernel: [opost_block+264/358] opost_block+0x108/0x166
Jul 20 01:52:35 werewolf kernel: [<c0209f01>] opost_block+0x108/0x166
Jul 20 01:52:35 werewolf kernel: [pty_write+297/321] pty_write+0x129/0x141
Jul 20 01:52:35 werewolf kernel: [<c020d483>] pty_write+0x129/0x141
Jul 20 01:52:35 werewolf kernel: [tty_default_put_char+30/35] tty_default_put_char+0x1e/0x23
Jul 20 01:52:35 werewolf kernel: [<c0209498>] tty_default_put_char+0x1e/0x23
Jul 20 01:52:35 werewolf kernel: [cdrom_ioctl+51/3282] cdrom_ioctl+0x33/0xcd2
Jul 20 01:52:35 werewolf kernel: [<c027c9b2>] cdrom_ioctl+0x33/0xcd2
Jul 20 01:52:35 werewolf kernel: [default_wake_function+0/12] default_wake_function+0x0/0xc
Jul 20 01:52:35 werewolf kernel: [<c0119b07>] default_wake_function+0x0/0xc
Jul 20 01:52:35 werewolf kernel: [tty_write+743/819] tty_write+0x2e7/0x333
Jul 20 01:52:35 werewolf kernel: [<c020683f>] tty_write+0x2e7/0x333
Jul 20 01:52:35 werewolf kernel: [free_pages_and_swap_cache+85/121] free_pages_and_swap_cache+0x55/0x79
Jul 20 01:52:35 werewolf kernel: [<c0152a25>] free_pages_and_swap_cache+0x55/0x79
Jul 20 01:52:35 werewolf kernel: [pg0+944604295/1069400064] idecd_ioctl+0x5d/0x71 [ide_cd]
Jul 20 01:52:35 werewolf kernel: [<f88fa487>] idecd_ioctl+0x5d/0x71 [ide_cd]
Jul 20 01:52:35 werewolf kernel: [blkdev_ioctl+131/1018] blkdev_ioctl+0x83/0x3fa
Jul 20 01:52:35 werewolf kernel: [<c022a5a3>] blkdev_ioctl+0x83/0x3fa
Jul 20 01:52:35 werewolf kernel: [sys_ioctl+425/673] sys_ioctl+0x1a9/0x2a1
Jul 20 01:52:35 werewolf kernel: [<c016a084>] sys_ioctl+0x1a9/0x2a1
Jul 20 01:52:35 werewolf kernel: [sys_gettimeofday+44/101] sys_gettimeofday+0x2c/0x65
Jul 20 01:52:35 werewolf kernel: [<c01215a9>] sys_gettimeofday+0x2c/0x65
Jul 20 01:52:35 werewolf kernel: [sysenter_past_esp+82/113] sysenter_past_esp+0x52/0x71
Jul 20 01:52:35 werewolf kernel: [<c0104005>] sysenter_past_esp+0x52/0x71
Jul 20 01:52:35 werewolf kernel: Code: c4 08 75 1f 8b 41 04 83 f8 ff 74 1f f0 83 41 04 ff 0f 98 c0 84 c0 74 0b 85 d2 75 08 89 c8 e9 40 fa ff ff c3
89 c8 e9 61 f4 ff ff <0f> 0b 1c 03 6c 55 31 c0 eb d7 85 c0 74 1e 05 00 00 00 40 c1 e8
--
J.A. Magallon <jamagallon()able!es> \ Software is like sex:
werewolf!able!es \ It's better when it's free
Mandrakelinux release 10.1 (Alpha 1) for i586
Linux 2.6.8-rc1-jam1 (gcc 3.4.1 (Mandrakelinux (Cooker) 3.4.1-1mdk)) #1
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: 2.6.8-rc1-mm1
2004-07-20 0:02 ` 2.6.8-rc1-mm1 J.A. Magallon
@ 2004-07-22 12:56 ` Jens Axboe
0 siblings, 0 replies; 18+ messages in thread
From: Jens Axboe @ 2004-07-22 12:56 UTC (permalink / raw)
To: J.A. Magallon; +Cc: Andrew Morton, linux-kernel
On Tue, Jul 20 2004, J.A. Magallon wrote:
>
> On 2004.07.14, Andrew Morton wrote:
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc1/2.6.8-rc1-mm1/
> >
>
> It oopses if you try to write on a CDRW without media loaded. Who would do
> such a stupid thing ? Me the impatient trying to write before the drive ends
> to load the disc...
It's fixed in later -mm, not sure if Andrew has merged the patch yet. I
have posted it here a week or two ago, here it is again.
--- /mnt/kscratch/linux-2.6.5/mm/highmem.c 2004-04-04 05:37:25.000000000 +0200
+++ linux-2.6.5-SUSE-20040713/mm/highmem.c 2004-07-15 10:28:12.142262512 +0200
@@ -309,12 +309,10 @@ static void bounce_end_io(struct bio *bi
{
struct bio *bio_orig = bio->bi_private;
struct bio_vec *bvec, *org_vec;
- int i;
+ int i, err = 0;
if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
- goto out_eio;
-
- set_bit(BIO_UPTODATE, &bio_orig->bi_flags);
+ err = -EIO;
/*
* free up bounce indirect pages used
@@ -327,8 +325,7 @@ static void bounce_end_io(struct bio *bi
mempool_free(bvec->bv_page, pool);
}
-out_eio:
- bio_endio(bio_orig, bio_orig->bi_size, 0);
+ bio_endio(bio_orig, bio_orig->bi_size, err);
bio_put(bio);
}
--- /mnt/kscratch/linux-2.6.5/fs/bio.c 2004-07-14 23:12:42.000000000 +0200
+++ linux-2.6.5-SUSE-20040713/fs/bio.c 2004-07-15 10:30:53.263775247 +0200
@@ -549,7 +549,6 @@ static struct bio *__bio_map_user(reques
bio->bi_rw |= (1 << BIO_RW);
bio->bi_flags |= (1 << BIO_USER_MAPPED);
- blk_queue_bounce(q, &bio);
return bio;
out:
kfree(pages);
--- /mnt/kscratch/linux-2.6.5/drivers/block/scsi_ioctl.c 2004-07-14 23:12:42.000000000 +0200
+++ linux-2.6.5-SUSE-20040713/drivers/block/scsi_ioctl.c 2004-07-15 10:26:39.089364958 +0200
@@ -167,6 +167,13 @@ static int sg_io(request_queue_t *q, str
rq->flags |= REQ_BLOCK_PC;
bio = rq->bio;
+ /*
+ * bounce this after holding a reference to the original bio, it's
+ * needed for proper unmapping
+ */
+ if (rq->bio)
+ blk_queue_bounce(q, &rq->bio);
+
rq->timeout = (hdr->timeout * HZ) / 1000;
if (!rq->timeout)
rq->timeout = q->sg_timeout;
--- /mnt/kscratch/linux-2.6.5/drivers/cdrom/cdrom.c 2004-07-14 23:12:42.000000000 +0200
+++ linux-2.6.5-SUSE-20040713/drivers/cdrom/cdrom.c 2004-07-15 10:27:17.219225057 +0200
@@ -1975,6 +1975,9 @@ static int cdrom_read_cdda_bpc(struct cd
rq->timeout = 60 * HZ;
bio = rq->bio;
+ if (rq->bio)
+ blk_queue_bounce(q, &rq->bio);
+
if (blk_execute_rq(q, cdi->disk, rq)) {
struct request_sense *s = rq->sense;
ret = -EIO;
--- /mnt/kscratch/linux-2.6.5/drivers/block/ll_rw_blk.c 2004-07-14 23:12:42.000000000 +0200
+++ linux-2.6.5-SUSE-20040713/drivers/block/ll_rw_blk.c 2004-07-15 10:34:51.152967583 +0200
@@ -1807,6 +1807,12 @@ EXPORT_SYMBOL(blk_insert_request);
*
* A matching blk_rq_unmap_user() must be issued at the end of io, while
* still in process context.
+ *
+ * Note: The mapped bio may need to be bounced through blk_queue_bounce()
+ * before being submitted to the device, as pages mapped may be out of
+ * reach. It's the callers responsibility to make sure this happens. The
+ * original bio must be passed back in to blk_rq_unmap_user() for proper
+ * unmapping.
*/
struct request *blk_rq_map_user(request_queue_t *q, int rw, void __user *ubuf,
unsigned int len)
--
Jens Axboe
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: 2.6.8-rc1-mm1
2004-07-14 1:25 2.6.8-rc1-mm1 Andrew Morton
` (8 preceding siblings ...)
2004-07-20 0:02 ` 2.6.8-rc1-mm1 J.A. Magallon
@ 2004-07-20 0:05 ` J.A. Magallon
9 siblings, 0 replies; 18+ messages in thread
From: J.A. Magallon @ 2004-07-20 0:05 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
On 2004.07.14, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc1/2.6.8-rc1-mm1/
>
This allows to build aic with db4, could you apply, please:
--- linux-2.6.0-test11/drivers/scsi/aic7xxx/aicasm/Makefile.orig 2003-12-02 23:52:29.000000000 +0100
+++ linux-2.6.0-test11/drivers/scsi/aic7xxx/aicasm/Makefile 2003-12-03 00:01:04.000000000 +0100
@@ -34,10 +34,14 @@
$(AICASM_CC) $(AICASM_CFLAGS) $(SRCS) -o $(PROG) $(LIBS)
aicdb.h:
- @if [ -e "/usr/include/db3/db_185.h" ]; then \
+ @if [ -e "/usr/include/db4/db_185.h" ]; then \
+ echo "#include <db4/db_185.h>" > aicdb.h; \
+ elif [ -e "/usr/include/db3/db_185.h" ]; then \
echo "#include <db3/db_185.h>" > aicdb.h; \
elif [ -e "/usr/include/db2/db_185.h" ]; then \
echo "#include <db2/db_185.h>" > aicdb.h; \
+ elif [ -e "/usr/include/db1/db_185.h" ]; then \
+ echo "#include <db1/db_185.h>" > aicdb.h; \
elif [ -e "/usr/include/db/db_185.h" ]; then \
echo "#include <db/db_185.h>" > aicdb.h; \
elif [ -e "/usr/include/db_185.h" ]; then \
--
J.A. Magallon <jamagallon()able!es> \ Software is like sex:
werewolf!able!es \ It's better when it's free
Mandrakelinux release 10.1 (Alpha 1) for i586
Linux 2.6.8-rc1-jam1 (gcc 3.4.1 (Mandrakelinux (Cooker) 3.4.1-1mdk)) #1
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread