Skip to contentSkip to conversation

SFI: fix compilation warnings

PATCH Superseded Andy Shevchenko 3 participants 10 messages Dec 5, 2013 – Dec 9, 2013 ACPI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SFI: fix compilation warnings

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

---
 drivers/sfi/sfi_acpi.c   | 2 +-
 include/linux/sfi_acpi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/sfi/sfi_acpi.c +1 -1
index 0c9f419..d4dfcbe 100644
@@ -60,7 +60,7 @@
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 #include <linux/sfi.h>
 #include <linux/sfi_acpi.h>
include/linux/sfi_acpi.h +1 -1
index 2cfcb79..c9cab82 100644
@@ -60,7 +60,7 @@
 #define _LINUX_SFI_ACPI_H
 
 #ifdef CONFIG_SFI
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 extern int sfi_acpi_table_parse(char *signature, char *oem_id,
 				char *oem_table_id,
Signature · 6 lines
1.8.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw
Quoted 9 lines · Andy Shevchenko

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

Quoted 3 lines

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing out entirely for the next cycle.

Thanks!

Quoted 32 lines
---
 drivers/sfi/sfi_acpi.c   | 2 +-
 include/linux/sfi_acpi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/sfi/sfi_acpi.c +1 -1
index 0c9f419..d4dfcbe 100644
@@ -60,7 +60,7 @@
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 #include <linux/sfi.h>
 #include <linux/sfi_acpi.h>
include/linux/sfi_acpi.h +1 -1
index 2cfcb79..c9cab82 100644
@@ -60,7 +60,7 @@
 #define _LINUX_SFI_ACPI_H
 
 #ifdef CONFIG_SFI
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 extern int sfi_acpi_table_parse(char *signature, char *oem_id,
 				char *oem_table_id,
Signature · 6 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
Quoted 10 lines · Rafael J. Wysocki
Quoted 9 lines · Andy Shevchenko

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

Quoted 8 lines
Quoted 3 lines

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing out entirely for the next cycle.

Or rather I'll keep it in bleeding-edge and wait for follow-up patches to fix build problems like this one (then we can merge it into 3.14 hopefully).

Thanks!

Quoted 33 lines
Quoted 32 lines
---
 drivers/sfi/sfi_acpi.c   | 2 +-
 include/linux/sfi_acpi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/sfi/sfi_acpi.c +1 -1
index 0c9f419..d4dfcbe 100644
@@ -60,7 +60,7 @@
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 #include <linux/sfi.h>
 #include <linux/sfi_acpi.h>
include/linux/sfi_acpi.h +1 -1
index 2cfcb79..c9cab82 100644
@@ -60,7 +60,7 @@
 #define _LINUX_SFI_ACPI_H
 
 #ifdef CONFIG_SFI
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 extern int sfi_acpi_table_parse(char *signature, char *oem_id,
 				char *oem_table_id,
Signature · 6 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#3 lore raw
In reply to Rafael J. Wysocki
Quoted 13 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 6:37 AM

Quoted 9 lines · Andy Shevchenko

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

Quoted 8 lines
Quoted 3 lines

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing out entirely for the next cycle.

No, I think Andy's patch is wrong.
This warning is existing before merging my fixes.

Either we fix this warning or leave it as is.

To fix it, you need to add 1 line in sfi_acpi.h rather than change the line. Let me post a fix for this.

Thanks
-Lv

Quoted 38 lines

Thanks!

Quoted 24 lines
---
 drivers/sfi/sfi_acpi.c   | 2 +-
 include/linux/sfi_acpi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/sfi/sfi_acpi.c +1 -1
index 0c9f419..d4dfcbe 100644
@@ -60,7 +60,7 @@
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 #include <linux/sfi.h>
 #include <linux/sfi_acpi.h>
include/linux/sfi_acpi.h +0 -0
index 2cfcb79..c9cab82 100644

include/linux/sfi_acpi.h line 66

Quoted 8 lines
include/linux/sfi_acpi.h +1 -1
@@ -60,7 +60,7 @@
 #define _LINUX_SFI_ACPI_H
 
 #ifdef CONFIG_SFI
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 extern int sfi_acpi_table_parse(char *signature, char *oem_id,
 				char *oem_table_id,

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

#4 lore raw
Quoted 15 lines · Lv
Quoted 15 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 6:37 AM

Quoted 11 lines · Andy Shevchenko

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing out entirely for the next cycle.

No, I think Andy's patch is wrong.

His patch may be wrong, but the warning in his changelog surely is real. :-)

Quoted 6 lines

This warning is existing before merging my fixes.

Either we fix this warning or leave it as is.

To fix it, you need to add 1 line in sfi_acpi.h rather than change the line. Let me post a fix for this.

Please do. And I'm putting all ACPI header cleanups on hold until all warnings of this kind have been fixed by them. Otherwise doing those cleanups makes a little sense in my opinion.

Thanks,
Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw
Quoted 32 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 9:26 AM

Quoted 15 lines · Lv
Quoted 15 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 6:37 AM

Quoted 11 lines · Andy Shevchenko

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing out entirely for the next cycle.

No, I think Andy's patch is wrong.

His patch may be wrong, but the warning in his changelog surely is real. :-)

Quoted 2 lines

This warning is existing before merging my fixes.

Quoted 8 lines
Quoted 4 lines

Either we fix this warning or leave it as is.

To fix it, you need to add 1 line in sfi_acpi.h rather than change the line. Let me post a fix for this.

Please do. And I'm putting all ACPI header cleanups on hold until all warnings of this kind have been fixed by them. Otherwise doing those cleanups makes a little sense in my opinion.

OK, not only this warning, there is another warning in sfi_acpi.c. I doubt whether they are strictly tested before upstreamed... They are all existing warnings.
You can apply my new patch before the cleanup series.

Thanks
-Lv

Quoted 3 lines

Thanks,
Rafael

#6 lore raw
Quoted 37 lines · Lv
Quoted 37 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 9:26 AM

Quoted 15 lines · Lv
Quoted 15 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 6:37 AM

Quoted 11 lines · Andy Shevchenko

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing out entirely for the next cycle.

No, I think Andy's patch is wrong.

His patch may be wrong, but the warning in his changelog surely is real. :-)

Quoted 6 lines

This warning is existing before merging my fixes.

Either we fix this warning or leave it as is.

To fix it, you need to add 1 line in sfi_acpi.h rather than change the line. Let me post a fix for this.

Quoted 8 lines
Quoted 3 lines

Please do. And I'm putting all ACPI header cleanups on hold until all warnings of this kind have been fixed by them. Otherwise doing those cleanups makes a little sense in my opinion.

OK, not only this warning, there is another warning in sfi_acpi.c. I doubt whether they are strictly tested before upstreamed... They are all existing warnings.
You can apply my new patch before the cleanup series.

Sorry, I'm already lost in the thick of patches. :-)

Please resend them all as a single series.

Thanks,
Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#7 lore raw
Quoted 48 lines

From: [email protected] [mailto:[email protected]] On Behalf Of Rafael J. Wysocki
Sent: Friday, December 06, 2013 10:01 AM
To: Zheng, Lv
Cc: Andy Shevchenko; Wysocki, Rafael J; [email protected]; LKML
Subject: Re: [PATCH] SFI: fix compilation warnings

Quoted 41 lines · Lv
Quoted 40 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 9:26 AM

Quoted 15 lines · Lv
Quoted 15 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 6:37 AM

Quoted 11 lines · Andy Shevchenko

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing out entirely for the next cycle.

No, I think Andy's patch is wrong.

His patch may be wrong, but the warning in his changelog surely is real. :-)

Quoted 6 lines

This warning is existing before merging my fixes.

Either we fix this warning or leave it as is.

To fix it, you need to add 1 line in sfi_acpi.h rather than change the line. Let me post a fix for this.

Please do. And I'm putting all ACPI header cleanups on hold until all warnings of this kind have been fixed by them. Otherwise doing those cleanups makes a little sense in my opinion.

Quoted 8 lines
Quoted 4 lines

OK, not only this warning, there is another warning in sfi_acpi.c. I doubt whether they are strictly tested before upstreamed... They are all existing warnings.
You can apply my new patch before the cleanup series.

Sorry, I'm already lost in the thick of patches. :-)

Please resend them all as a single series.

OK, I'll sort them again.

Thanks
-Lv

Quoted 8 lines

Thanks,
Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#8 lore raw
Quoted 53 lines · Lv
Quoted 53 lines

From: [email protected] [mailto:[email protected]] On Behalf Of Rafael J. Wysocki
Sent: Friday, December 06, 2013 10:01 AM
To: Zheng, Lv
Cc: Andy Shevchenko; Wysocki, Rafael J; [email protected]; LKML
Subject: Re: [PATCH] SFI: fix compilation warnings

Quoted 45 lines · Lv
Quoted 32 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 9:26 AM

Quoted 15 lines · Lv
Quoted 15 lines

From: Rafael J. Wysocki [mailto:[email protected]]
Sent: Friday, December 06, 2013 6:37 AM

Quoted 11 lines · Andy Shevchenko

When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing out entirely for the next cycle.

No, I think Andy's patch is wrong.

His patch may be wrong, but the warning in his changelog surely is real. :-)

Quoted 2 lines

This warning is existing before merging my fixes.

Quoted 8 lines
Quoted 4 lines

Either we fix this warning or leave it as is.

To fix it, you need to add 1 line in sfi_acpi.h rather than change the line. Let me post a fix for this.

Please do. And I'm putting all ACPI header cleanups on hold until all warnings of this kind have been fixed by them. Otherwise doing those cleanups makes a little sense in my opinion.

OK, not only this warning, there is another warning in sfi_acpi.c. I doubt whether they are strictly tested before upstreamed... They are all existing warnings.
You can apply my new patch before the cleanup series.

Quoted 5 lines
Quoted 3 lines

Sorry, I'm already lost in the thick of patches. :-)

Please resend them all as a single series.

OK, I'll sort them again.

First of all, you are right. We have to have acpi/acpi.h _and_ linux/acpi.h in sfi_acpi.h.

Please, also check this one:
http://www.mail-archive.com/[email protected]/msg01521.html

Signature · 7 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#9 lore raw
In reply to Andy Shevchenko

Hi,

Quoted 5 lines

From: Andy Shevchenko [mailto:[email protected]]
Sent: Friday, December 06, 2013 1:27 AM

When build kernel with make W=1 we get the following compiler error.

Quoted 8 lines

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

Have you tested this patch with:
CONFIG_ACPI=n
CONFIG_SFI=y

Will this trigger build errors like:

Quoted 22 lines
Quoted 2 lines

arch/x86/pci/mmconfig-shared.c:551:13: warning: 'struct acpi_mcfg_allocation' declared inside parameter list [enabled by default] arch/x86/pci/mmconfig-shared.c:551:13: warning: its scope is only this definition or declaration, which is probably not what you want

[enabled by default]

Quoted 11 lines

arch/x86/pci/mmconfig-shared.c:551:13: warning: 'struct acpi_table_mcfg' declared inside parameter list [enabled by default] arch/x86/pci/mmconfig-shared.c: In function 'acpi_mcfg_check_entry':
arch/x86/pci/mmconfig-shared.c:555:9: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:558:19: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:561:10: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:567:2: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:567:2: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:567:2: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:567:2: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c: In function 'pci_parse_mcfg':
arch/x86/pci/mmconfig-shared.c:588:12: error: dereferencing pointer to incomplete type

Quoted 8 lines

arch/x86/pci/mmconfig-shared.c:588:30: error: invalid application of 'sizeof' to incomplete type 'struct acpi_table_mcfg' arch/x86/pci/mmconfig-shared.c:589:21: error: invalid application of 'sizeof' to incomplete type 'struct acpi_mcfg_allocation' arch/x86/pci/mmconfig-shared.c:591:15: error: invalid application of 'sizeof' to incomplete type 'struct acpi_mcfg_allocation' arch/x86/pci/mmconfig-shared.c:598:22: error: invalid use of undefined type 'struct acpi_table_mcfg' arch/x86/pci/mmconfig-shared.c:598:51: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:600:3: error: invalid use of undefined type 'struct acpi_mcfg_allocation' arch/x86/pci/mmconfig-shared.c:600:19: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:601:3: warning: passing argument 1 of 'acpi_mcfg_check_entry' from incompatible pointer type

Quoted 16 lines

[enabled by default]

Quoted 1 line

arch/x86/pci/mmconfig-shared.c:550:19: note: expected 'struct acpi_table_mcfg *' but argument is of type 'struct acpi_table_mcfg

*'

Quoted 1 line

arch/x86/pci/mmconfig-shared.c:601:3: warning: passing argument 2 of 'acpi_mcfg_check_entry' from incompatible pointer type

[enabled by default]

Quoted 1 line

arch/x86/pci/mmconfig-shared.c:550:19: note: expected 'struct acpi_mcfg_allocation *' but argument is of type 'struct

acpi_mcfg_allocation *'

Quoted 9 lines

arch/x86/pci/mmconfig-shared.c:606:27: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:606:45: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:607:11: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c:607:32: error: dereferencing pointer to incomplete type arch/x86/pci/mmconfig-shared.c: In function 'pci_mmcfg_early_init':
arch/x86/pci/mmconfig-shared.c:649:25: error: 'ACPI_SIG_MCFG' undeclared (first use in this function) arch/x86/pci/mmconfig-shared.c:649:25: note: each undeclared identifier is reported only once for each function it appears in arch/x86/pci/mmconfig-shared.c: In function 'pci_mmcfg_late_init':
arch/x86/pci/mmconfig-shared.c:665:24: error: 'ACPI_SIG_MCFG' undeclared (first use in this function)

Please check.

Thanks
-Lv

Quoted 35 lines
---
 drivers/sfi/sfi_acpi.c   | 2 +-
 include/linux/sfi_acpi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/sfi/sfi_acpi.c +1 -1
index 0c9f419..d4dfcbe 100644
@@ -60,7 +60,7 @@
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 #include <linux/sfi.h>
 #include <linux/sfi_acpi.h>
include/linux/sfi_acpi.h +1 -2
index 2cfcb79..c9cab82 100644
@@ -60,7 +60,7 @@
 #define _LINUX_SFI_ACPI_H
 
 #ifdef CONFIG_SFI
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 extern int sfi_acpi_table_parse(char *signature, char *oem_id,
 				char *oem_table_id,
--

1.8.4.4