2001-11-13 01:27:22

by Louis E Garcia II

Subject: 2.4.15-pre4 compile error

setup.c: In funtion 'c_start':
setup.c:2791: subscripted value is neither array nor pointer
setup.c:2792: warning: control reaches end of non-void function
make[1]: *** [setup.o] Error 1

2001-11-13 01:33:42

by Mike Fedyk

Subject: Re: 2.4.15-pre4 compile error

On Mon, Nov 12, 2001 at 08:27:51PM -0500, Louis Garcia wrote:
>
> setup.c: In funtion 'c_start':
> setup.c:2791: subscripted value is neither array nor pointer
> setup.c:2792: warning: control reaches end of non-void function
> make[1]: *** [setup.o] Error 1
>

This patch, (from RML) will fix it.

It's already been posted...

diff -u linux-2.4.15-pre4/include/asm-i386/processor.h linux/include/asm-i386/processor.h
--- linux-2.4.15-pre4/include/asm-i386/processor.h Mon Nov 12 15:17:47 2001+++ linux/include/asm-i386/processor.h Mon Nov 12 15:40:32 2001
@@ -76,7 +76,7 @@
extern struct cpuinfo_x86 cpu_data[];
#define current_cpu_data cpu_data[smp_processor_id()]
#else
-#define cpu_data &boot_cpu_data
+#define cpu_data (&boot_cpu_data)
#define current_cpu_data boot_cpu_data
#endif

Robert Love

2001-11-13 03:04:52

by Barry K. Nathan

Subject: [PATCH] Re: 2.4.15-pre4 compile error

> This patch, (from RML) will fix it.
>
> It's already been posted...
[snip]

FWIW, this is Linus' fix, turned into a patch...

-Barry K. Nathan <[email protected]>

diff -ruN linux-2.4.15-pre4/arch/i386/kernel/setup.c linux-2.4.15-pre4-bkn1/arch/i386/kernel/setup.c
--- linux-2.4.15-pre4/arch/i386/kernel/setup.c Mon Nov 12 12:39:56 2001
+++ linux-2.4.15-pre4-bkn1/arch/i386/kernel/setup.c Mon Nov 12 13:04:24 2001
@@ -2788,7 +2788,7 @@

static void *c_start(struct seq_file *m, loff_t *pos)
{
- return *pos < NR_CPUS ? &cpu_data[*pos] : NULL;
+ return *pos < NR_CPUS ? cpu_data+*pos : NULL;
}
static void *c_next(struct seq_file *m, void *v, loff_t *pos)
{
diff -ruN linux-2.4.15-pre4/include/asm-i386/processor.h linux-2.4.15-pre4-bkn1/include/asm-i386/processor.h
--- linux-2.4.15-pre4/include/asm-i386/processor.h Mon Nov 12 12:43:21 2001
+++ linux-2.4.15-pre4-bkn1/include/asm-i386/processor.h Mon Nov 12 13:33:01 2001
@@ -76,7 +76,7 @@
extern struct cpuinfo_x86 cpu_data[];
#define current_cpu_data cpu_data[smp_processor_id()]
#else
-#define cpu_data &boot_cpu_data
+#define cpu_data (&boot_cpu_data)
#define current_cpu_data boot_cpu_data
#endif