linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lukas Wunner <lukas@wunner.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	intel-gfx@lists.freedesktop.org,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-acpi@vger.kernel.org, linux-next@vger.kernel.org,
	Darren Hart <dvhart@linux.intel.com>
Subject: Re: linux-next: build failure after merge of the drm-misc tree
Date: Wed, 10 Feb 2016 14:17:41 +0100	[thread overview]
Message-ID: <20160210131741.GA15492@wunner.de> (raw)
In-Reply-To: <20160210084138.GA15392@wunner.de>

Hi,

On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote:
> On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> > include/linux/apple-gmux.h: In function 'apple_gmux_present':
> > include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> >   return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> >                                           ^
> > 
> > Caused by commit
> > 
> >   2413306c2566 ("apple-gmux: Add helper for presence detect")
> > 
> > I have used the drm-misc tree from next-20160209 for today.
> 
> Ugh, apologies, I didn't have a non-ACPI platform available to test
> this on.
> 
> Solution is to either add to include/linux/acpi.h
> 
> static inline bool acpi_dev_present(const char *hid)
> {
> 	return false;
> }
> 
> somewhere below
> 
> #else	/* !CONFIG_ACPI */
> 
> or alternatively to add to include/linux/apple-gmux.h
> 
> IS_ENABLED(CONFIG_ACPI)
> 
> in apple_gmux_present().
> 
> I'll check the other users of acpi_dev_present() to see which of
> these two solutions is more appropriate and will post a fix shortly.

The patch included below fixes the build if CONFIG_ACPI is not set.

@Daniel Vetter: Would it be possible to squash this with 2413306c2566
("apple-gmux: Add helper for presence detect") on topic/drm-misc so
as to avoid build breakage for anyone trying to bisect between that
commit and this fix?

I checked all other users of acpi_dev_present() and all of them are
only compiled if CONFIG_ACPI is set. Hence I opted to fix this in
<linux/apple-gmux.h> rather than in <linux/acpi.h>.

Thanks again Stephen for reporting this at such an early stage,
though doubtlessly it would have been better if I had thought of
this possibility when preparing the original patch, or if I had
compile-tested without CONFIG_ACPI. :-(

Lukas

-- >8 --
Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI

The DRM drivers i915, nouveau and radeon may be compiled with
CONFIG_ACPI not set, in which case acpi_dev_present() is undefined.

Add a no-op stub for apple_gmux_present() which is used if
CONFIG_APPLE_GMUX is not enabled to avoid build breakage.
(CONFIG_APPLE_GMUX depends on CONFIG_ACPI.)

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
 include/linux/apple-gmux.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h
index feebc28..b2d32e0 100644
--- a/include/linux/apple-gmux.h
+++ b/include/linux/apple-gmux.h
@@ -22,6 +22,8 @@
 
 #define GMUX_ACPI_HID "APP000B"
 
+#if IS_ENABLED(CONFIG_APPLE_GMUX)
+
 /**
  * apple_gmux_present() - detect if gmux is built into the machine
  *
@@ -33,7 +35,16 @@
  */
 static inline bool apple_gmux_present(void)
 {
-	return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
+	return acpi_dev_present(GMUX_ACPI_HID);
 }
 
+#else  /* !CONFIG_APPLE_GMUX */
+
+static inline bool apple_gmux_present(void)
+{
+	return false;
+}
+
+#endif /* !CONFIG_APPLE_GMUX */
+
 #endif /* LINUX_APPLE_GMUX_H */
-- 
1.8.5.2 (Apple Git-48)

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2016-02-10 13:17 UTC|newest]

Thread overview: 193+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-10  1:24 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2016-02-10  6:31 ` Daniel Vetter
2016-02-10  8:41 ` Lukas Wunner
2016-02-10 13:17   ` Lukas Wunner [this message]
2016-02-10 13:37     ` Daniel Vetter
  -- strict thread matches above, loose matches on Subject: below --
2024-02-22  1:46 Stephen Rothwell
2024-02-22  8:14 ` Biju Das
2024-02-22  8:29   ` Geert Uytterhoeven
2024-02-22  9:16     ` Biju Das
2024-02-22  8:32   ` Maxime Ripard
2024-02-22  8:49     ` Biju Das
2024-02-13  1:04 Stephen Rothwell
2024-02-12  1:26 Stephen Rothwell
2024-02-12  9:12 ` Jani Nikula
2024-02-12 13:09   ` Jani Nikula
2024-02-06  4:28 Stephen Rothwell
2024-02-12  1:25 ` Stephen Rothwell
2024-02-12 13:15 ` Jani Nikula
2024-02-19 21:48   ` Stephen Rothwell
2024-02-25 21:41     ` Stephen Rothwell
2024-02-25 21:47       ` Stephen Rothwell
2024-02-26 12:56         ` Christian König
2024-02-06  1:28 Stephen Rothwell
2024-02-06 11:46 ` Jani Nikula
2024-02-06 12:39 ` Thomas Hellström
2024-02-07  2:46 ` Stephen Rothwell
2023-11-26 23:38 Stephen Rothwell
2023-11-27  2:12 ` Luben Tuikov
2023-10-12  1:22 Stephen Rothwell
2023-10-12  1:27 ` Stephen Rothwell
2023-10-12  7:09   ` Greg Kroah-Hartman
2023-10-20  2:00   ` Stephen Rothwell
2023-08-07  1:36 Stephen Rothwell
2023-04-03  2:16 Stephen Rothwell
2023-04-03  8:51 ` Qiang Yu
2023-04-04  1:14   ` Stephen Rothwell
2022-11-17  7:32 Stephen Rothwell
2022-11-23  5:20 ` Stephen Rothwell
2022-11-23  5:35   ` David Airlie
2022-11-23  6:22     ` Stephen Rothwell
2022-11-23  8:33     ` Thomas Zimmermann
2022-11-16  0:38 Stephen Rothwell
2022-11-10  0:10 Stephen Rothwell
2022-10-21  0:02 Stephen Rothwell
2022-10-21  1:11 ` Zack Rusin
2022-06-21  2:36 Stephen Rothwell
2022-06-21  7:48 ` Ville Syrjälä
2022-06-22  1:04   ` Stephen Rothwell
2022-06-22 13:55     ` Ville Syrjälä
2022-06-10  4:49 Stephen Rothwell
2022-06-10  9:23 ` Javier Martinez Canillas
2022-04-08  1:10 Stephen Rothwell
2022-04-08  8:17 ` Christian König
2022-04-06  0:50 Stephen Rothwell
2022-04-06  8:56 ` Paul Cercueil
2021-10-15  9:26 Stephen Rothwell
2021-10-15  9:56 ` Jani Nikula
2021-10-15 10:23   ` Stephen Rothwell
2021-11-01  8:42 ` Stephen Rothwell
2021-11-05  6:15   ` Stephen Rothwell
2021-11-05 11:03     ` Jani Nikula
2021-11-05 11:57       ` Maxime Ripard
2021-11-06  2:33       ` Stephen Rothwell
2021-11-09  7:40         ` Jani Nikula
2021-11-09  9:16           ` Daniel Vetter
2021-11-09 11:09             ` Jani Nikula
2021-10-12  2:18 Stephen Rothwell
2021-10-12 11:29 ` Karol Herbst
     [not found] ` <202110141102364478237@zte.com.cn>
2021-10-14  5:42   ` Karol Herbst
2021-09-17  7:09 Stephen Rothwell
2021-06-08  2:50 Stephen Rothwell
2021-06-08  5:37 ` Felix Kuehling
2021-06-08  6:55   ` Christian König
2021-06-08  7:06     ` Felix Kuehling
2021-06-08  7:11       ` Christian König
2021-06-09 13:48         ` Daniel Vetter
2021-06-07  2:33 Stephen Rothwell
2021-06-07  6:39 ` Christian König
2021-05-12  5:00 Stephen Rothwell
2021-05-12 18:58 ` Thomas Zimmermann
2021-02-10  3:11 Stephen Rothwell
2021-02-10 14:31 ` Maarten Lankhorst
2021-02-01  2:10 Stephen Rothwell
2021-01-14  0:31 Stephen Rothwell
2021-01-14 11:16 ` Thomas Zimmermann
2020-11-10  2:26 Stephen Rothwell
2020-11-02  1:43 Stephen Rothwell
2020-11-02  9:28 ` Daniel Vetter
2020-11-02 10:23   ` Michael S. Tsirkin
2020-11-02 10:28     ` Daniel Vetter
2020-11-02 10:27   ` Christoph Hellwig
2020-11-02 11:05     ` Michael S. Tsirkin
2020-11-02 10:19 ` Michael S. Tsirkin
2020-11-11  6:10   ` Stephen Rothwell
2020-11-11 12:48     ` Michael S. Tsirkin
2020-10-30  0:07 Stephen Rothwell
2020-10-30  7:53 ` Christian König
2020-10-08  3:09 Stephen Rothwell
2020-10-08  4:42 ` Stephen Rothwell
2020-10-12  4:24   ` Stephen Rothwell
2020-10-12  4:26     ` Stephen Rothwell
2020-10-12 10:15     ` Paul Cercueil
2020-10-13 11:12     ` Paul Cercueil
2020-08-26  0:55 Stephen Rothwell
2020-09-02  3:06 ` Stephen Rothwell
2020-06-17  0:59 Stephen Rothwell
2020-06-17  6:33 ` Thomas Zimmermann
2020-06-17  7:03   ` Stephen Rothwell
2020-06-17 19:06     ` Emil Velikov
2020-06-24  1:36 ` Stephen Rothwell
2020-06-24  5:47   ` Dave Airlie
2020-06-24  7:16     ` Stephen Rothwell
2020-04-20  3:01 Stephen Rothwell
2020-04-28 22:33 ` Stephen Rothwell
2020-04-29  8:09   ` Bartlomiej Zolnierkiewicz
2020-04-29 10:50     ` Bartlomiej Zolnierkiewicz
2019-12-16  1:23 Stephen Rothwell
2019-12-17 13:19 ` Daniel Vetter
2019-12-17 20:22   ` Stephen Rothwell
2019-12-18 11:53     ` Daniel Vetter
2019-10-16  0:22 Stephen Rothwell
2019-10-16 16:21 ` Alex Deucher
2019-10-09  0:35 Stephen Rothwell
2019-10-09 16:17 ` Alex Deucher
2019-10-07 23:30 Stephen Rothwell
2019-10-08  3:02 ` Stephen Rothwell
2019-10-08  7:56 ` Hans Verkuil
2019-10-14  0:12 ` Stephen Rothwell
2019-08-28  8:55 Stephen Rothwell
2019-08-28  9:15 ` Gerd Hoffmann
2019-08-07  3:21 Stephen Rothwell
2019-08-01  2:30 Stephen Rothwell
2019-06-14  4:41 Stephen Rothwell
2019-04-09  6:08 Stephen Rothwell
2019-04-09  7:22 ` Gerd Hoffmann
2019-04-09  8:08   ` Stephen Rothwell
2019-04-09  8:31     ` Gerd Hoffmann
2019-04-05  4:55 Stephen Rothwell
2019-04-05  6:03 ` Stephen Rothwell
2019-04-01 23:50 Stephen Rothwell
2019-04-02  5:55 ` Qiang Yu
2019-04-02  7:57   ` Daniel Vetter
2019-04-02  8:59     ` Qiang Yu
2019-04-02  9:08       ` Daniel Vetter
2019-04-02 11:26   ` Matthew Wilcox
2019-04-02 13:56     ` Qiang Yu
2019-04-02 14:10       ` Matthew Wilcox
2019-04-02 11:21 ` Matthew Wilcox
2019-04-02 13:33   ` Qiang Yu
2019-02-08  1:38 Stephen Rothwell
2019-02-08  8:52 ` Daniel Vetter
2019-02-08 22:17   ` Sam Ravnborg
2019-01-08  0:12 Stephen Rothwell
2019-01-08  8:37 ` Daniel Vetter
2019-01-08 14:01   ` Kazlauskas, Nicholas
2019-01-09  0:29   ` Stephen Rothwell
2018-12-06  2:32 Stephen Rothwell
2018-12-07 12:37 ` Koenig, Christian
2017-12-06  1:00 Stephen Rothwell
2017-07-19  1:46 Stephen Rothwell
2017-07-21  0:08 ` Stephen Rothwell
2017-07-21  7:24   ` Daniel Vetter
2017-07-21 19:01     ` Hans de Goede
2017-07-24  0:03     ` Stephen Rothwell
2017-07-24  8:24       ` Daniel Vetter
2017-07-24 18:33         ` Greg KH
2017-07-18  1:38 Stephen Rothwell
2017-04-21  2:10 Stephen Rothwell
2017-04-21  5:03 ` Logan Gunthorpe
2017-04-24  1:25 ` Stephen Rothwell
2017-05-02  8:25   ` Daniel Vetter
2017-05-02  8:41     ` Stephen Rothwell
2017-05-02  8:55       ` Arnd Bergmann
2017-05-02  9:34         ` Daniel Vetter
2017-05-03 23:50 ` Stephen Rothwell
2017-04-03  3:31 Stephen Rothwell
2017-04-03 17:26 ` Sinclair Yeh
2017-01-05  0:53 Stephen Rothwell
2017-01-05 10:24 ` [Intel-gfx] " Jani Nikula
2017-01-05 10:46   ` Stephen Rothwell
2016-11-09  0:14 Stephen Rothwell
2016-10-24  0:24 Stephen Rothwell
2015-12-08  0:20 Stephen Rothwell
2015-10-01  2:47 Stephen Rothwell
2015-10-01  6:41 ` Daniel Vetter
2015-09-03  0:49 Stephen Rothwell
2015-09-07 23:42 ` Stephen Rothwell
2015-09-08  4:48   ` Maarten Lankhorst
2015-09-08  8:16     ` Daniel Vetter
2015-07-14  2:52 Stephen Rothwell
2015-07-14  5:00 ` Archit Taneja
2015-07-14  7:36   ` Daniel Vetter
2015-02-24  0:41 Stephen Rothwell
2015-02-24  0:59 ` Daniel Vetter

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=20160210131741.GA15492@wunner.de \
    --to=lukas@wunner.de \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=dvhart@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=sfr@canb.auug.org.au \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).