Re: 2.6.7-rc2-mm1

[Andrey Panin]

On 153, 06 01, 2004 at 12:00:32PM +0200, Gabriel Ebner wrote:
> Hello,
> 
> Compiling 2.6.7-rc2-mm1 on x86_64 using the attached config gives me the
> following error, though 2.6.7-rc1-mm2 compiled just fine:
> 
> ...
>   AS      arch/x86_64/lib/memset.o
>   AS      arch/x86_64/lib/putuser.o
>   AS      arch/x86_64/lib/thunk.o
>   CC      arch/x86_64/lib/usercopy.o
>   LD      arch/x86_64/lib/built-in.o
>   AR      arch/x86_64/lib/lib.a
>   GEN     .version
>   CHK     include/linux/compile.h
>   UPD     include/linux/compile.h
>   CC      init/version.o
>   LD      init/built-in.o
>   LD      .tmp_vmlinux1
> arch/x86_64/kernel/built-in.o(.init.text+0x4236): In function
> `dmi_disable_acpi':
> : undefined reference to `acpi_force'
> arch/x86_64/kernel/built-in.o(.init.text+0x42a7): In function
> `force_acpi_ht':
> : undefined reference to `acpi_force'
> arch/x86_64/kernel/built-in.o(.init.text+0x4347): In function
> `acpi_boot_init':
> : undefined reference to `dmi_get_system_info'
> arch/x86_64/kernel/built-in.o(.init.text+0x43a9): In function
> `acpi_boot_init':
> : undefined reference to `acpi_force'
> arch/x86_64/kernel/built-in.o(.init.text+0x4408): In function
> `acpi_boot_init':
> : undefined reference to `dmi_check_system'
> arch/x86_64/ia32/built-in.o(.data+0x898): In function `ia32_sys_call_table':
> : undefined reference to `compat_get_mempolicy'
> drivers/built-in.o(.init.text+0xff1): In function `acpi_sleep_init':
> : undefined reference to `dmi_check_system'
> drivers/built-in.o(.init.text+0x848a): In function `i8042_init':
> : undefined reference to `dmi_check_system'
> arch/x86_64/pci/built-in.o(.init.text+0xb3f): In function
> `pcibios_irq_init':
> : undefined reference to `dmi_check_system'
> make: *** [.tmp_vmlinux1] Fehler 1
> schnecke2 linux #
 
Try the attached patch, it should fix DMI related problem.

-- 
Andrey Panin		| Linux and UNIX system administrator
pazke@xxxxxxxxx		| PGP key: wwwkeys.pgp.net
diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc2-mm1.vanilla/include/linux/dmi.h linux-2.6.7-rc2-mm1/include/linux/dmi.h
--- linux-2.6.7-rc2-mm1.vanilla/include/linux/dmi.h	2004-06-01 14:48:18.000000000 +0400
+++ linux-2.6.7-rc2-mm1/include/linux/dmi.h	2004-06-01 14:50:24.000000000 +0400
@@ -32,7 +32,7 @@ struct dmi_system_id {
 
 #define DMI_MATCH(a,b)	{ a, b }
 
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) && !defined(CONFIG_X86_64)
 
 extern int dmi_check_system(struct dmi_system_id *list);
 extern char * dmi_get_system_info(int field);

Attachment: signature.asc
Description: Digital signature