summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorRobert Love <rml@tech9.net>2002-08-28 23:24:27 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-08-28 23:24:27 -0700
commit4ca6eaac0d34d8c729d1c63ad975f21d32888033 (patch)
treecd0a33183b3054d3e18a7a8027aca09b210c4e09 /include/linux
parentac3f75f4455b76878807dcc873f6778ff2269b1b (diff)
[PATCH] misc. kernel preemption bits
Misc. kernel preemption-related bits. Specifically, - update to Documentation/preempt-locking.txt (me) - preempt-safe arch/i386/kernel/ioport.c :: sys_ioperm() (George Anzinger) - remove "kernel_lock()" cruft in include/linux/smp.h (Andrew Morton) - we have a debug check in preempt_schedule that, even on detecting a schedule with irqs disabled, still goes ahead and reschedules. We should return. (me) - preempt-safe net/core/dev.c :: netif_rx() (George Anzinger)
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/smp.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 8ed8547e5212..d45ea63d2d6e 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -87,9 +87,6 @@ int cpu_up(unsigned int cpu);
#define smp_processor_id() 0
#define hard_smp_processor_id() 0
#define smp_threads_ready 1
-#ifndef CONFIG_PREEMPT
-#define kernel_lock()
-#endif
#define smp_call_function(func,info,retry,wait) ({ 0; })
static inline void smp_send_reschedule(int cpu) { }
static inline void smp_send_reschedule_all(void) { }