2007-01-06 02:39:37

by Chris Wright

[permalink] [raw]
Subject: [patch 36/50] NET: Dont export linux/random.h outside __KERNEL__

-stable review patch. If anyone has any objections, please let us know.
------------------

From: David Woodhouse <[email protected]>

Don't add it there please; add it lower down inside the existing #ifdef
__KERNEL__. You just made the _userspace_ net.h include random.h, which
then fails to compile unless <asm/types.h> was already included.

Signed-off-by: David Woodhouse <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Chris Wright <[email protected]>

---
include/linux/net.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.19.1.orig/include/linux/net.h
+++ linux-2.6.19.1/include/linux/net.h
@@ -19,7 +19,6 @@
#define _LINUX_NET_H

#include <linux/wait.h>
-#include <linux/random.h>
#include <asm/socket.h>

struct poll_table_struct;
@@ -57,6 +56,7 @@ typedef enum {

#ifdef __KERNEL__
#include <linux/stringify.h>
+#include <linux/random.h>

#define SOCK_ASYNC_NOSPACE 0
#define SOCK_ASYNC_WAITDATA 1

--