Commit ef3d7714 authored Sep 16, 2008 by David Miller Committed by Linus Torvalds Sep 16, 2008

Fix PNP build failure, bugzilla #11276

This fill fix the following regression list entry:

Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=11276
Subject		: build error: CONFIG_OPTIMIZE_INLINING=y causes gcc 4.2 to do stupid things
Submitter	: Randy Dunlap <randy.dunlap@oracle.com>
Date		: 2008-08-06 17:18 (38 days old)
References	: http://marc.info/?l=linux-kernel&m=121804329014332&w=4
		  http://lkml.org/lkml/2008/7/22/353
Handled-By	: Bjorn Helgaas <bjorn.helgaas@hp.com>
Patch		: http://lkml.org/lkml/2008/7/22/364



with what I believe is a better fix than the one referenced
in the regression entry above.

These PNP header interfaces try to work in such a way that
you can reference some of them even if PNP is not enabled,
and the compiler was expected to optimize everything away.

Which is mostly fine, except that there was one interface
for which there was not provided an inline "NOP" implementation.

Once we add that, all of these compile failures cannot handle
any more.

pnp: Provide NOP inline implementation of pnp_get_resource() when !PNP

Fixes kernel bugzilla #11276.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 49f276be

include/linux/pnp.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -21,7 +21,14 @@ struct pnp_dev;
		/*
		* Resource Management
		*/
		#ifdef CONFIG_PNP
		struct resource pnp_get_resource(struct pnp_dev , unsigned int, unsigned int);
		#else
		static inline struct resource pnp_get_resource(struct pnp_dev dev, unsigned int type, unsigned int num)
		{
		return NULL;
		}
		#endif

		static inline int pnp_resource_valid(struct resource *res)
		{

Admin message