x86_64 build patch

x86_64 build patch

[Andrei Petrov]

This patch makes recent unstable buildable on x86_64.

--- xen/arch/x86/acpi/boot.c.orig       2005-05-11 09:54:27.000000000 -0700
+++ xen/arch/x86/acpi/boot.c    2005-05-11 14:48:37.000000000 -0700
@@ -41,21 +41,11 @@ int sbf_port;
 #define end_pfn_map max_page
 #define CONFIG_ACPI_PCI
 
-#ifdef CONFIG_X86_64
-
-static inline void  acpi_madt_oem_check(char *oem_id, char *oem_table_id) { }
-extern void __init clustered_apic_check(void);
-static inline int ioapic_setup_disabled(void) { return 0; }
-
-#else  /* X86 */
-
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <mach_apic.h>
 #include <mach_mpparse.h>
 #endif /* CONFIG_X86_LOCAL_APIC */
 
-#endif /* X86 */
-
 #define BAD_MADT_ENTRY(entry, end) (                                       \
                (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
                ((acpi_table_entry_header *)entry)->length != sizeof(*entry))

Re: x86_64 build patch

[David F Barrera]

I noticed that the May 11 x86_64 build breaks as follows:

gcc -nostdinc -fno-builtin -fno-common -fno-strict-aliasing -iwithprefix
include -Wall -Werror -Wno-pointer-arith -pipe -I/tmp/xen-
unstable/xen/include -I/tmp/xen-unstable/xen/include/asm-x86/mach-
default -O3 -fomit-frame-pointer -msoft-float -m64 -mno-red-zone -fpic -
fno-reorder-blocks -fno-asynchronous-unwind-tables -DNDEBUG -c
acpi/boot.c -o acpi/boot.o
acpi/boot.c:48: error: redefinition of `ioapic_setup_disabled'
/tmp/xen-unstable/xen/include/asm/acpi.h:142: error:
`ioapic_setup_disabled' previously defined here
make[3]: *** [acpi/boot.o] Error 1
make[3]: Leaving directory `/tmp/xen-unstable/xen/arch/x86'
make[2]: *** [/tmp/xen-unstable/xen/xen] Error 2
make[2]: Leaving directory `/tmp/xen-unstable/xen'
make[1]: *** [xen] Error 2
make[1]: Leaving directory `/tmp/xen-unstable'
make: *** [world] Error 2

I am assuming your patch was not included in the source yet, so I tried
applying your patch, but it failed:

bl2-2:/tmp/xen-unstable/xen # patch -p1 < /skyline/barrera/x86_64.patch
patching file arch/x86/acpi/boot.c
Hunk #1 FAILED at 41.
1 out of 1 hunk FAILED -- saving rejects to file
arch/x86/acpi/boot.c.rej

If your patch *was* included in the May 11 source, then it may be the
cause of the break.

On Wed, 2005-05-11 at 14:54 -0700, Andrei Petrov wrote:
> This patch makes recent unstable buildable on x86_64.
> 
> --- xen/arch/x86/acpi/boot.c.orig       2005-05-11 09:54:27.000000000 -0700
> +++ xen/arch/x86/acpi/boot.c    2005-05-11 14:48:37.000000000 -0700
> @@ -41,21 +41,11 @@ int sbf_port;
>  #define end_pfn_map max_page
>  #define CONFIG_ACPI_PCI
>  
> -#ifdef CONFIG_X86_64
> -
> -static inline void  acpi_madt_oem_check(char *oem_id, char *oem_table_id) { }
> -extern void __init clustered_apic_check(void);
> -static inline int ioapic_setup_disabled(void) { return 0; }
> -
> -#else  /* X86 */
> -
>  #ifdef CONFIG_X86_LOCAL_APIC
>  #include <mach_apic.h>
>  #include <mach_mpparse.h>
>  #endif /* CONFIG_X86_LOCAL_APIC */
>  
> -#endif /* X86 */
> -
>  #define BAD_MADT_ENTRY(entry, end) (                                       \
>                 (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
>                 ((acpi_table_entry_header *)entry)->length != sizeof(*entry))
> 
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
> 
-- 
Regards,

David F Barrera
Linux Technology Center
Systems and Technology Group, IBM

"The wisest men follow their own direction. "
                                                        Euripides

Re: x86_64 build patch

[Andrei Petrov]

On Thu, May 12, 2005 at 07:52:37AM -0500, David F Barrera wrote:
> 
> I am assuming your patch was not included in the source yet, so I tried
> applying your patch, but it failed:
> 
> bl2-2:/tmp/xen-unstable/xen # patch -p1 < /skyline/barrera/x86_64.patch
> patching file arch/x86/acpi/boot.c
> Hunk #1 FAILED at 41.
> 1 out of 1 hunk FAILED -- saving rejects to file
> arch/x86/acpi/boot.c.rej
> 
> If your patch *was* included in the May 11 source, then it may be the
> cause of the break.
> 
> On Wed, 2005-05-11 at 14:54 -0700, Andrei Petrov wrote:
> > This patch makes recent unstable buildable on x86_64.
> > 
> > --- xen/arch/x86/acpi/boot.c.orig       2005-05-11 09:54:27.000000000 -0700
> > +++ xen/arch/x86/acpi/boot.c    2005-05-11 14:48:37.000000000 -0700

That's because of -p1, i think, i made the patch from inside source tree,
probably bad idea, anyway that doesn't matter as the fix is in tree now.