[PATCH] Re: 2.4.15-pre4 compile error

Barry K. Nathan (barryn@pobox.com)
Mon, 12 Nov 2001 19:05:00 -0800 (PST)


> 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 <barryn@pobox.com>

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/