summaryrefslogtreecommitdiff
path: root/include/linux/smp.h
diff options
context:
space:
mode:
authorRobert Love <rml@tech9.net>2002-02-08 19:11:35 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-02-08 19:11:35 -0800
commitec332cd30cf1ccde914a87330ff66744414c8d24 (patch)
tree36d00dc307aa1e4eef2c5c91ec722dd2f1a45834 /include/linux/smp.h
parentd7b654751759e2a2e1d49aebf595c12e55ca7b69 (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 'include/linux/smp.h')
-rw-r--r--include/linux/smp.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h
index bb1ff5c5ea1a..43bef9087932 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -81,7 +81,9 @@ extern volatile int smp_msg_id;
#define smp_processor_id() 0
#define hard_smp_processor_id() 0
#define smp_threads_ready 1
+#ifndef CONFIG_PREEMPT
#define kernel_lock()
+#endif
#define cpu_logical_map(cpu) 0
#define cpu_number_map(cpu) 0
#define smp_call_function(func,info,retry,wait) ({ 0; })