From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: [PATCH] linux/x86: Obtain EDD info from Xen
Date: Thu, 21 Jun 2007 14:05:24 -0700
Message-ID: <467AE814.5050107@goop.org>
References: <4677CF61.76E4.0078.0@novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <4677CF61.76E4.0078.0@novell.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Jan Beulich <jbeulich@novell.com>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Jan Beulich wrote:
>  #ifdef CONFIG_EDD_MODULE
>  EXPORT_SYMBOL(edd);
>  #endif
> +#ifndef CONFIG_XEN
>  /**
>   * copy_edd() - Copy the BIOS EDD information
>   *              from boot_params into a safe place.
> @@ -237,6 +239,7 @@ static inline void copy_edd(void)
>       edd.mbr_signature_nr = EDD_MBR_SIG_NR;
>       edd.edd_info_nr = EDD_NR;
>  }
> +#endif
>  #else
>  static inline void copy_edd(void)
>  {
>   

This doesn't compile with CONFIG_EDD unset.  The static inline 
copy_edd() conflicts with the xen/firmware.h declaration.

    J