Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1660776 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-06-08 08:10 +0200 |
| Last post | 2017-06-08 13:40 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: build failure after merge of the uuid tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-08 08:10 +0200
Re: linux-next: build failure after merge of the uuid tree Christoph Hellwig <hch@lst.de> - 2017-06-08 09:10 +0200
Re: linux-next: build failure after merge of the uuid tree Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-06-08 13:40 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-06-08 08:10 +0200 |
| Subject | linux-next: build failure after merge of the uuid tree |
| Message-ID | <tPYNP-vi-15@gated-at.bofh.it> |
Hi Christoph,
After merging the uuid tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from drivers/base/cpu.c:16:0:
include/linux/acpi.h:744:16: error: unknown type name 'guid_t'
const guid_t *guid,
^
Caused by commit
94116f8126de ("ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()")
linux/uuid.h is only include for the CONFIG_ACPI case (in commit
41c8bdb3ab10 "acpi, nfit: Switch to use new generic UUID API"). This
build does not have CONFIG_ACPI set.
I have used the uuid tree from next-20170607 for today.
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Christoph Hellwig <hch@lst.de> |
|---|---|
| Date | 2017-06-08 09:10 +0200 |
| Message-ID | <tPZJT-16j-7@gated-at.bofh.it> |
| In reply to | #1660776 |
On Thu, Jun 08, 2017 at 04:04:15PM +1000, Stephen Rothwell wrote:
> Hi Christoph,
>
> After merging the uuid tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> In file included from drivers/base/cpu.c:16:0:
> include/linux/acpi.h:744:16: error: unknown type name 'guid_t'
> const guid_t *guid,
> ^
>
> Caused by commit
>
> 94116f8126de ("ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()")
>
> linux/uuid.h is only include for the CONFIG_ACPI case (in commit
> 41c8bdb3ab10 "acpi, nfit: Switch to use new generic UUID API"). This
> build does not have CONFIG_ACPI set.
Meh. Fix below:
---
From bcbc2265f269cc57924371e3bce8c3220d0270c5 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Thu, 8 Jun 2017 09:02:20 +0200
Subject: acpi: always include uuid.h
Without this the build will fail for !CONFIG_ACPI builds on x86.
Fixes: 94116f81 ("ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()")
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/acpi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index ab19365c905f..cafdfb84ca28 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -26,6 +26,7 @@
#include <linux/resource_ext.h>
#include <linux/device.h>
#include <linux/property.h>
+#include <linux/uuid.h>
#ifndef _LINUX
#define _LINUX
@@ -39,7 +40,6 @@
#include <linux/dynamic_debug.h>
#include <linux/module.h>
#include <linux/mutex.h>
-#include <linux/uuid.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Date | 2017-06-08 13:40 +0200 |
| Message-ID | <tQ3Xc-3Gr-13@gated-at.bofh.it> |
| In reply to | #1660807 |
On Thu, 2017-06-08 at 09:04 +0200, Christoph Hellwig wrote:
> On Thu, Jun 08, 2017 at 04:04:15PM +1000, Stephen Rothwell wrote:
> > Hi Christoph,
> >
> > After merging the uuid tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > In file included from drivers/base/cpu.c:16:0:
> > include/linux/acpi.h:744:16: error: unknown type name 'guid_t'
> > const guid_t *guid,
> > ^
> >
> > Caused by commit
> >
> > 94116f8126de ("ACPI: Switch to use generic guid_t in
> > acpi_evaluate_dsm()")
> >
> > linux/uuid.h is only include for the CONFIG_ACPI case (in commit
> > 41c8bdb3ab10 "acpi, nfit: Switch to use new generic UUID
> > API"). This
> > build does not have CONFIG_ACPI set.
>
> Meh. Fix below:
Oh, indeed.
Thanks for taking care!
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> ---
> From bcbc2265f269cc57924371e3bce8c3220d0270c5 Mon Sep 17 00:00:00 2001
> From: Christoph Hellwig <hch@lst.de>
> Date: Thu, 8 Jun 2017 09:02:20 +0200
> Subject: acpi: always include uuid.h
>
> Without this the build will fail for !CONFIG_ACPI builds on x86.
>
> Fixes: 94116f81 ("ACPI: Switch to use generic guid_t in
> acpi_evaluate_dsm()")
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> include/linux/acpi.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index ab19365c905f..cafdfb84ca28 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -26,6 +26,7 @@
> #include <linux/resource_ext.h>
> #include <linux/device.h>
> #include <linux/property.h>
> +#include <linux/uuid.h>
>
> #ifndef _LINUX
> #define _LINUX
> @@ -39,7 +40,6 @@
> #include <linux/dynamic_debug.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> -#include <linux/uuid.h>
>
> #include <acpi/acpi_bus.h>
> #include <acpi/acpi_drivers.h>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web