Re: [Xen-devel] [PATCH] dbgp: fix compile error on building EARLY_PRINTK_DBGP without USB_SUPPORT

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 28.10.12 at 18:44, Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx> 
>>> wrote:
> This patch fixes following compile error:
> 
> drivers/built-in.o: In function `dbgp_reset_prep':
> linux/drivers/usb/early/ehci-dbgp.c:984: undefined reference to 
> `xen_dbgp_reset_prep'
> drivers/built-in.o: In function `dbgp_external_startup':
> linux/drivers/usb/early/ehci-dbgp.c:619: undefined reference to 
> `xen_dbgp_external_startup'
> 
> EARLY_PRINTK_DBGP should work without USB_SUPPORT.

An alternative patch was previously suggested to address this
build problem.

Jan

> Cc: Jan Beulich <JBeulich@xxxxxxxx>
> Signed-off-by: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/xen/Kconfig          | 3 +++
>  drivers/xen/Makefile         | 2 +-
>  include/linux/usb/ehci_def.h | 2 +-
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
> index 126d8ce..9bb3420 100644
> --- a/drivers/xen/Kconfig
> +++ b/drivers/xen/Kconfig
> @@ -206,4 +206,7 @@ config XEN_MCE_LOG
>         Allow kernel fetching MCE error from Xen platform and
>         converting it into Linux mcelog format for mcelog tools
>  
> +config XEN_DBGP
> +     def_bool y if XEN_DOM0 && (USB_SUPPORT || EARLY_PRINTK_DBGP)
> +
>  endmenu
> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
> index 0e863703..d23ed07 100644
> --- a/drivers/xen/Makefile
> +++ b/drivers/xen/Makefile
> @@ -9,7 +9,7 @@ nostackp := $(call cc-option, -fno-stack-protector)
>  CFLAGS_features.o                    := $(nostackp)
>  
>  dom0-$(CONFIG_PCI) += pci.o
> -dom0-$(CONFIG_USB_SUPPORT) += dbgp.o
> +dom0-$(CONFIG_XEN_DBGP) += dbgp.o
>  dom0-$(CONFIG_ACPI) += acpi.o
>  dom0-$(CONFIG_X86) += pcpu.o
>  obj-$(CONFIG_XEN_DOM0)                       += $(dom0-y)
> diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
> index daec99a..7d8f7fe 100644
> --- a/include/linux/usb/ehci_def.h
> +++ b/include/linux/usb/ehci_def.h
> @@ -223,7 +223,7 @@ extern struct console early_dbgp_console;
>  
>  struct usb_hcd;
>  
> -#ifdef CONFIG_XEN_DOM0
> +#ifdef CONFIG_XEN_DBGP
>  extern int xen_dbgp_reset_prep(struct usb_hcd *);
>  extern int xen_dbgp_external_startup(struct usb_hcd *);
>  #else




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel