LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Liu, Jinsong" <jinsong.liu@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	"Wu, Fengguang" <fengguang.wu@intel.com>
Subject: RE: linux-next: build failure after merge of the xen-two tree
Date: Fri, 15 Feb 2013 17:08:24 +0000	[thread overview]
Message-ID: <DE8DF0795D48FD4CA783C40EC82923353FBF51@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <20130215154551.d11e9d376d30d32b9673e6cc@canb.auug.org.au>

Stephen Rothwell wrote:
> Hi Konrad,
> 
> After merging the xen-two tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/xen/xen-acpi-memhotplug.c: In function
> 'acpi_memory_get_device': 
> drivers/xen/xen-acpi-memhotplug.c:191:2: error: implicit declaration
> of function 'acpi_bus_add' [-Werror=implicit-function-declaration]
> drivers/xen/xen-acpi-memhotplug.c: At top level: 
> drivers/xen/xen-acpi-memhotplug.c:417:3: warning: initialization from
> incompatible pointer type [enabled by default]
> drivers/xen/xen-acpi-memhotplug.c:417:3: warning: (near
> initialization for 'xen_acpi_memory_device_driver.ops.remove')
> [enabled by default]   
> 
> Caused by commit 259f201cb7ea ("xen/acpi: ACPI memory hotplug").
> 
> drivers/xen/xen-acpi-cpuhotplug.c: In function
> 'acpi_processor_device_add': 
> drivers/xen/xen-acpi-cpuhotplug.c:254:2: error: implicit declaration
> of function 'acpi_bus_add' [-Werror=implicit-function-declaration]
> drivers/xen/xen-acpi-cpuhotplug.c: At top level: 
> drivers/xen/xen-acpi-cpuhotplug.c:425:3: warning: initialization from
> incompatible pointer type [enabled by default]
> drivers/xen/xen-acpi-cpuhotplug.c:425:3: warning: (near
> initialization for 'xen_acpi_processor_driver.ops.remove') [enabled
> by default]   
> 
> Caused by commit 181232c249f0 ("xen/acpi: ACPI cpu hotplug").
> 
> These commits interacted with commits 636458de36f1 ("ACPI: Remove the
> arguments of acpi_bus_add() that are not used"), 0cd6ac52b333 ("ACPI:
> Make acpi_bus_scan() and acpi_bus_add() take only one argument") and
> b8bd759acd05 ("ACPI / scan: Drop acpi_bus_add() and use
> acpi_bus_scan() 
> instead") from the pm tree.
> 
> I have added this merge fix patch and can carry it as necessary (I did
> *not* fix the warnings above):

Thanks Stephen to fix the confliction between xen and pm tree!
As for the warnings above, I have just sent out a patch 1 minutes ago to fix it.

Regards,
Jinsong

> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 15 Feb 2013 15:37:27 +1100
> Subject: [PATCH] xen/acpi: fix up for apci_bus_add api change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
>  drivers/xen/xen-acpi-memhotplug.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/xen/xen-acpi-cpuhotplug.c
> b/drivers/xen/xen-acpi-cpuhotplug.c 
> index 9eefbb0..0db4722 100644
> --- a/drivers/xen/xen-acpi-cpuhotplug.c
> +++ b/drivers/xen/xen-acpi-cpuhotplug.c
> @@ -251,7 +251,7 @@ int acpi_processor_device_add(acpi_handle handle,
>  	struct acpi_device **device) if (acpi_bus_get_device(phandle,
>  		&pdev)) return -ENODEV;
> 
> -	if (acpi_bus_add(device, pdev, handle, ACPI_BUS_TYPE_PROCESSOR))
> +	if (acpi_bus_scan(handle))
>  		return -ENODEV;
> 
>  	return 0;
> diff --git a/drivers/xen/xen-acpi-memhotplug.c
> b/drivers/xen/xen-acpi-memhotplug.c 
> index 678680c..164287b 100644
> --- a/drivers/xen/xen-acpi-memhotplug.c
> +++ b/drivers/xen/xen-acpi-memhotplug.c
> @@ -188,7 +188,7 @@ acpi_memory_get_device(acpi_handle handle,
>  	 * Now add the notified device.  This creates the acpi_device
>  	 * and invokes .add function
>  	 */
> -	result = acpi_bus_add(&device, pdevice, handle,
> ACPI_BUS_TYPE_DEVICE); +	result = acpi_bus_scan(handle);
>  	if (result) {
>  		pr_warn(PREFIX "Cannot add acpi bus\n");
>  		return -EINVAL;
> --
> 1.8.1


  parent reply	other threads:[~2013-02-15 17:09 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-15  4:45 Stephen Rothwell
2013-02-15 13:26 ` Konrad Rzeszutek Wilk
2013-02-15 13:50   ` Stephen Rothwell
2013-02-15 14:53     ` Rafael J. Wysocki
2013-02-15 14:52       ` Stephen Rothwell
2013-02-15 17:46         ` Liu, Jinsong
2013-02-16 20:11         ` Rafael J. Wysocki
2013-02-17  7:31           ` Liu, Jinsong
2013-02-17 14:08             ` Rafael J. Wysocki
2013-02-20 20:49               ` Konrad Rzeszutek Wilk
2013-02-20 21:24                 ` Rafael J. Wysocki
2013-02-21  6:40                 ` Liu, Jinsong
2013-02-15 17:20   ` Liu, Jinsong
2013-02-15 17:08 ` Liu, Jinsong [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-02-04  4:14 Stephen Rothwell
2013-02-05 18:30 ` Konrad Rzeszutek Wilk
2013-03-02 15:39   ` Stephen Rothwell
2012-10-02  4:33 Stephen Rothwell
2011-02-10  4:46 Stephen Rothwell
2011-02-10 12:24 ` Thomas Gleixner
2011-02-10 15:22   ` Konrad Rzeszutek Wilk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DE8DF0795D48FD4CA783C40EC82923353FBF51@SHSMSX101.ccr.corp.intel.com \
    --to=jinsong.liu@intel.com \
    --cc=fengguang.wu@intel.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --cc=sfr@canb.auug.org.au \
    --subject='RE: linux-next: build failure after merge of the xen-two tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).