linux-next: build failure after merge of the acpi tree

linux-next: build failure after merge of the acpi tree

[Stephen Rothwell]

Hi Len,

After merging the acpi tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/acpi/debugfs.c: In function 'cm_write':
drivers/acpi/debugfs.c:36: error: implicit declaration of function 'copy_from_user'

Caused by commit c0b82d427637c7598af5d7926187a7781c03bce8 ("ACPI:
introduce drivers/acpi/debugfs.c"), interacting with something that
stopped linux/uaccess.h from being implicitly included.  See Rule 1 in
Documentation/SubmitChecklist.

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Aug 2010 10:52:30 +1000
Subject: [PATCH] acpi: using copy_from_user needs linux/uaccess.h

fixes this build error:

drivers/acpi/debugfs.c: In function 'cm_write':
drivers/acpi/debugfs.c:36: error: implicit declaration of function 'copy_from_user'

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/acpi/debugfs.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c
index f0cd0e7..4f19078 100644
--- a/drivers/acpi/debugfs.c
+++ b/drivers/acpi/debugfs.c
@@ -6,6 +6,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/debugfs.h>
+#include <linux/uaccess.h>
 #include <acpi/acpi_drivers.h>
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

linux-next: build failure after merge of the acpi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1968 bytes --]

Hi Len,

After merging the acpi tree, today's linux-next build (x86_64_allmodconfig)
failed like this:

drivers/usb/core/usb-acpi.c: In function 'usb_acpi_check_port_connect_type':
drivers/usb/core/usb-acpi.c:90:18: error: storage size of 'pld' isn't known

Caused by commit 05f916894a69 ("usb/acpi: Store info on device
removability") from Linus' tree interacting with commit 8ede06aba5df
("ACPI: Use ACPICA native way to decode the PLD buffer") from the acpi
tree.

I applied this merge fix that I have been applying to the usb tree (which
has now been merged by Linus).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Sep 2012 16:51:38 +1000
Subject: [PATCH] usb-acpi: Comply with the ACPI API change after usb tree merge

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/usb/core/usb-acpi.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index 0ef7d42..e9b159a 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -87,7 +87,7 @@ static int usb_acpi_check_port_connect_type(struct usb_device *hdev,
 	acpi_status status;
 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 	union acpi_object *upc;
-	struct acpi_pld pld;
+	struct acpi_pld_info *pld;
 	int ret = 0;
 
 	/*
@@ -111,13 +111,13 @@ static int usb_acpi_check_port_connect_type(struct usb_device *hdev,
 	}
 
 	if (upc->package.elements[0].integer.value)
-		if (pld.user_visible)
+		if (pld->user_visible)
 			usb_set_hub_port_connect_type(hdev, port1,
 				USB_PORT_CONNECT_TYPE_HOT_PLUG);
 		else
 			usb_set_hub_port_connect_type(hdev, port1,
 				USB_PORT_CONNECT_TYPE_HARD_WIRED);
-	else if (!pld.user_visible)
+	else if (!pld->user_visible)
 		usb_set_hub_port_connect_type(hdev, port1, USB_PORT_NOT_USED);
 
 out:

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the acpi tree

[Feng Tang]

On Thu, 2 Aug 2012 11:20:33 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Len,
> 
> After merging the acpi tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/iommu/amd_iommu_init.c: In function 'early_amd_iommu_init':
> drivers/iommu/amd_iommu_init.c:1535:2: error: implicit declaration of
> function 'acpi_get_table_with_size' [-Werror=implicit-function-declaration]
> 
> Caused by commit 705d9245d714 ("ACPI: remove acpi_get_table_with_size()
> fucntion").
> 
> This extra call to acpi_get_table_with_size() was added by commit
> 02f3b3f5449c ("iommu/amd: Use acpi_get_table instead of
> acpi_table_parse") added to Linus' tree on about July 25 via the iommu
> tree.

Thanks for the root cause, Yinghai also noticed me about that, and I've
send a updated patch 
	https://lkml.org/lkml/2012/8/1/25 

So it should be ok after Len merge this v2 patch.

Thanks,
Feng

> 
> I have reverted the acpi tree commit for today.

linux-next: build failure after merge of the acpi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

Hi Len,

After merging the acpi tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/iommu/amd_iommu_init.c: In function 'early_amd_iommu_init':
drivers/iommu/amd_iommu_init.c:1535:2: error: implicit declaration of function 'acpi_get_table_with_size' [-Werror=implicit-function-declaration]

Caused by commit 705d9245d714 ("ACPI: remove acpi_get_table_with_size()
fucntion").

This extra call to acpi_get_table_with_size() was added by commit
02f3b3f5449c ("iommu/amd: Use acpi_get_table instead of
acpi_table_parse") added to Linus' tree on about July 25 via the iommu
tree.

I have reverted the acpi tree commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the acpi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1506 bytes --]

Hi Len,

On Thu, 2 Dec 2010 11:22:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the acpi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from drivers/video/output.c:25:
> include/linux/video_output.h: In function 'video_output_register':
> include/linux/video_output.h:49: error: implicit declaration of function 'ERR_PTR'
> include/linux/video_output.h:49: warning: return makes pointer from integer without a cast
> In file included from drivers/video/output.c:27:
> include/linux/err.h: At top level:
> include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
> include/linux/video_output.h:49: note: previous implicit declaration of 'ERR_PTR' was here
> drivers/video/output.c:84: error: redefinition of 'video_output_register'
> include/linux/video_output.h:44: note: previous definition of 'video_output_register' was here
> drivers/video/output.c:114: error: redefinition of 'video_output_unregister'
> include/linux/video_output.h:51: note: previous definition of 'video_output_unregister' was here
> 
> Caused by commit 16d21716c8849c3283d1b9e590e6fe8d1966f4b7 ("ACPI: video:
> fix build for VIDEO_OUTPUT_CONTROL=n").  See Rule 1 in
> Documentation/SubmitChecklist.
> 
> I have used the version of the acpi tree from next-20101201 for today.

I am still getting this failure.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the acpi tree

[Rafael J. Wysocki]

On Thursday, December 02, 2010, Stephen Rothwell wrote:
> Hi Len,
> 
> After merging the acpi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from drivers/video/output.c:25:
> include/linux/video_output.h: In function 'video_output_register':
> include/linux/video_output.h:49: error: implicit declaration of function 'ERR_PTR'
> include/linux/video_output.h:49: warning: return makes pointer from integer without a cast
> In file included from drivers/video/output.c:27:
> include/linux/err.h: At top level:
> include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
> include/linux/video_output.h:49: note: previous implicit declaration of 'ERR_PTR' was here
> drivers/video/output.c:84: error: redefinition of 'video_output_register'
> include/linux/video_output.h:44: note: previous definition of 'video_output_register' was here
> drivers/video/output.c:114: error: redefinition of 'video_output_unregister'
> include/linux/video_output.h:51: note: previous definition of 'video_output_unregister' was here
> 
> Caused by commit 16d21716c8849c3283d1b9e590e6fe8d1966f4b7 ("ACPI: video:
> fix build for VIDEO_OUTPUT_CONTROL=n").  See Rule 1 in
> Documentation/SubmitChecklist.
> 
> I have used the version of the acpi tree from next-20101201 for today.

Something like this will help, perhaps:

---
 include/linux/video_output.h |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/include/linux/video_output.h
===================================================================
--- linux-2.6.orig/include/linux/video_output.h
+++ linux-2.6/include/linux/video_output.h
@@ -23,6 +23,7 @@
 #ifndef _LINUX_VIDEO_OUTPUT_H
 #define _LINUX_VIDEO_OUTPUT_H
 #include <linux/device.h>
+#include <linux/err.h>
 struct output_device;
 struct output_properties {
 	int (*set_state)(struct output_device *);

linux-next: build failure after merge of the acpi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

Hi Len,

After merging the acpi tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from drivers/video/output.c:25:
include/linux/video_output.h: In function 'video_output_register':
include/linux/video_output.h:49: error: implicit declaration of function 'ERR_PTR'
include/linux/video_output.h:49: warning: return makes pointer from integer without a cast
In file included from drivers/video/output.c:27:
include/linux/err.h: At top level:
include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
include/linux/video_output.h:49: note: previous implicit declaration of 'ERR_PTR' was here
drivers/video/output.c:84: error: redefinition of 'video_output_register'
include/linux/video_output.h:44: note: previous definition of 'video_output_register' was here
drivers/video/output.c:114: error: redefinition of 'video_output_unregister'
include/linux/video_output.h:51: note: previous definition of 'video_output_unregister' was here

Caused by commit 16d21716c8849c3283d1b9e590e6fe8d1966f4b7 ("ACPI: video:
fix build for VIDEO_OUTPUT_CONTROL=n").  See Rule 1 in
Documentation/SubmitChecklist.

I have used the version of the acpi tree from next-20101201 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]