login
Header Space

 
 

[PATCH, XFS] Fix random.h include for non-debug builds

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Stephen Rothwell <sfr@...>
Cc: David Chinner <dgc@...>, <linux-next@...>, <xfs-masters@...>, Christoph Hellwig <hch@...>, Lachlan McIlroy <lachlan@...>, LKML <linux-kernel@...>, Linus <torvalds@...>, Andrew Morton <akpm@...>
Date: Wednesday, April 30, 2008 - 3:11 am

On Wed, Apr 30, 2008 at 04:42:18PM +1000, Stephen Rothwell wrote:

It should break anything that builds a non-debug XFS, not just powerpc.


No, the correct patch is below. Linus, can you please apply?

Cheers,

Dave.

---
Include linux/random.h in all builds, not just debug.


Signed-off-by: Dave Chinner <dgc@sgi.com>
---
 fs/xfs/linux-2.6/xfs_linux.h |    1 +
 fs/xfs/support/debug.h       |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

Index: 2.6.x-xfs-new/fs/xfs/linux-2.6/xfs_linux.h
===================================================================
--- 2.6.x-xfs-new.orig/fs/xfs/linux-2.6/xfs_linux.h	2008-04-22 15:06:11.000000000 +1000
+++ 2.6.x-xfs-new/fs/xfs/linux-2.6/xfs_linux.h	2008-04-30 16:38:38.754688626 +1000
@@ -75,6 +75,7 @@
 #include <linux/delay.h>
 #include <linux/log2.h>
 #include <linux/spinlock.h>
+#include <linux/random.h>
 
 #include <asm/page.h>
 #include <asm/div64.h>
Index: 2.6.x-xfs-new/fs/xfs/support/debug.h
===================================================================
--- 2.6.x-xfs-new.orig/fs/xfs/support/debug.h	2007-08-02 22:13:10.000000000 +1000
+++ 2.6.x-xfs-new/fs/xfs/support/debug.h	2008-04-30 16:38:43.518080606 +1000
@@ -49,8 +49,6 @@ extern void assfail(char *expr, char *f,
 
 #else /* DEBUG */
 
-#include <linux/random.h>
-
 #define ASSERT(expr)	\
 	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
linux-next: xfs build failure, Stephen Rothwell, (Wed Apr 30, 12:00 am)
Re: linux-next: xfs build failure, David Chinner, (Wed Apr 30, 2:35 am)
Re: linux-next: xfs build failure, Stephen Rothwell, (Wed Apr 30, 2:42 am)
[PATCH, XFS] Fix random.h include for non-debug builds, David Chinner, (Wed Apr 30, 3:11 am)
speck-geostationary