* EDD breaks x86-64 build
@ 2004-06-30 5:22 Jeff Garzik
2004-06-30 18:17 ` Matt Domsch
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Garzik @ 2004-06-30 5:22 UTC (permalink / raw)
To: Matt Domsch, Andrew Morton; +Cc: Linux Kernel
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
CC arch/x86_64/kernel/setup.o
arch/x86_64/kernel/setup.c: In function `copy_edd':
arch/x86_64/kernel/setup.c:415: error: `EDD_MBR_SIGNATURE' undeclared
(first use in this function)
arch/x86_64/kernel/setup.c:415: error: (Each undeclared identifier is
reported only once
arch/x86_64/kernel/setup.c:415: error: for each function it appears in.)
arch/x86_64/kernel/setup.c:417: error: `EDD_MBR_SIG_NR' undeclared
(first use in this function)
make[1]: *** [arch/x86_64/kernel/setup.o] Error 1
make: *** [arch/x86_64/kernel] Error 2
config and dmesg attached, if interested.
[-- Attachment #2: config.txt.bz2 --]
[-- Type: application/x-bzip2, Size: 4818 bytes --]
[-- Attachment #3: dmesg.txt.bz2 --]
[-- Type: application/x-bzip2, Size: 4294 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: EDD breaks x86-64 build
2004-06-30 5:22 EDD breaks x86-64 build Jeff Garzik
@ 2004-06-30 18:17 ` Matt Domsch
0 siblings, 0 replies; 2+ messages in thread
From: Matt Domsch @ 2004-06-30 18:17 UTC (permalink / raw)
To: Jeff Garzik, torvalds; +Cc: Andrew Morton, Linux Kernel
[-- Attachment #1: Type: text/plain, Size: 1665 bytes --]
On Wed, Jun 30, 2004 at 01:22:21AM -0400, Jeff Garzik wrote:
> CC arch/x86_64/kernel/setup.o
> arch/x86_64/kernel/setup.c: In function `copy_edd':
> arch/x86_64/kernel/setup.c:415: error: `EDD_MBR_SIGNATURE' undeclared
> (first use in this function)
> arch/x86_64/kernel/setup.c:415: error: (Each undeclared identifier is
> reported only once
> arch/x86_64/kernel/setup.c:415: error: for each function it appears in.)
> arch/x86_64/kernel/setup.c:417: error: `EDD_MBR_SIG_NR' undeclared
> (first use in this function)
> make[1]: *** [arch/x86_64/kernel/setup.o] Error 1
> make: *** [arch/x86_64/kernel] Error 2
Arrgh. On i386 it's in include/asm-i386/setup.h On x86_64 it
belongs in include/asm-x86_64/bootsetup.h.
Patch below defines EDD_MBR_SIG_NR and EDD_MBR_SIGNATURE on x86_64.
Signed-off-by: Matt_Domsch <Matt_Domsch@dell.com>
===== include/asm-x86_64/bootsetup.h 1.4 vs edited =====
--- 1.4/include/asm-x86_64/bootsetup.h 2004-04-12 12:53:56 -05:00
+++ edited/include/asm-x86_64/bootsetup.h 2004-06-30 13:12:35 -05:00
@@ -26,8 +26,9 @@
#define INITRD_START (*(unsigned int *) (PARAM+0x218))
#define INITRD_SIZE (*(unsigned int *) (PARAM+0x21c))
#define EDID_INFO (*(struct edid_info *) (PARAM+0x440))
-#define DISK80_SIGNATURE (*(unsigned int*) (PARAM+DISK80_SIG_BUFFER))
#define EDD_NR (*(unsigned char *) (PARAM+EDDNR))
+#define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF))
+#define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
#define EDD_BUF ((struct edd_info *) (PARAM+EDDBUF))
#define COMMAND_LINE saved_command_line
#define COMMAND_LINE_SIZE 256
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-06-30 18:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-06-30 5:22 EDD breaks x86-64 build Jeff Garzik
2004-06-30 18:17 ` Matt Domsch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox