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

[Andy Shevchenko]

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@xxxxxxxxxxxxxxx>

> 
> ---
> From bcbc2265f269cc57924371e3bce8c3220d0270c5 Mon Sep 17 00:00:00 2001
> From: Christoph Hellwig <hch@xxxxxx>
> 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@xxxxxx>
> ---
> Â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@xxxxxxxxxxxxxxx>
Intel Finland Oy