diff options
| author | Robert Love <rml@tech9.net> | 2002-02-08 19:11:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-02-08 19:11:35 -0800 |
| commit | ec332cd30cf1ccde914a87330ff66744414c8d24 (patch) | |
| tree | 36d00dc307aa1e4eef2c5c91ec722dd2f1a45834 /net/socket.c | |
| parent | d7b654751759e2a2e1d49aebf595c12e55ca7b69 (diff) | |
[PATCH] Re: [PATCH] Preemptible Kernel for 2.5
On Sat, 2002-02-09 at 01:43, Linus Torvalds wrote:
> That will clean up all your issues with header file ordering.
You are right, it did. I removed all the sched.h dependencies and this
reduced the size of the patch greatly. I now use current_thread_info()
and none of the header or include hackery from before. I've tested this
with and without preemption enabled with success.
I appreciate your help with this.
Again, this is a minimal i386-only patch. I have other arches,
documentation, etc. Patch against 2.5.4-pre5. Enjoy,
Robert Love
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 2965aa8d0f49..588328c30ff3 100644 --- a/net/socket.c +++ b/net/socket.c @@ -132,7 +132,7 @@ static struct file_operations socket_file_ops = { static struct net_proto_family *net_families[NPROTO]; -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT) static atomic_t net_family_lockct = ATOMIC_INIT(0); static spinlock_t net_family_lock = SPIN_LOCK_UNLOCKED; |