Fix userspace export of <linux/net.h>

Including <linux/fcntl.h> in the user-visible part of this header has
caused build regressions with headers from 2.6.27-rc. Move it down to
the #ifdef __KERNEL__ part, which is the only place it's needed. Move
some other kernel-only things down there too, while we're at it.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Woodhouse 2008-08-26 15:29:22 +01:00 committed by Linus Torvalds
parent b22dfb735a
commit 5770a3fb5f
1 changed files with 7 additions and 7 deletions

View File

@ -18,16 +18,9 @@
#ifndef _LINUX_NET_H #ifndef _LINUX_NET_H
#define _LINUX_NET_H #define _LINUX_NET_H
#include <linux/wait.h>
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */
#include <asm/socket.h> #include <asm/socket.h>
struct poll_table_struct;
struct pipe_inode_info;
struct inode;
struct net;
#define NPROTO AF_MAX #define NPROTO AF_MAX
#define SYS_SOCKET 1 /* sys_socket(2) */ #define SYS_SOCKET 1 /* sys_socket(2) */
@ -62,6 +55,13 @@ typedef enum {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/wait.h>
#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */
struct poll_table_struct;
struct pipe_inode_info;
struct inode;
struct net;
#define SOCK_ASYNC_NOSPACE 0 #define SOCK_ASYNC_NOSPACE 0
#define SOCK_ASYNC_WAITDATA 1 #define SOCK_ASYNC_WAITDATA 1