diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
| commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
| tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /kernel | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 2 | ||||
| -rw-r--r-- | kernel/timer.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index f77eaa4ee..641de8b22 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -131,6 +131,7 @@ static inline int dup_mmap(struct mm_struct * mm) flush_cache_mm(current->mm); mm->locked_vm = 0; mm->mmap = NULL; + mm->mmap_avl = NULL; mm->mmap_cache = NULL; mm->map_count = 0; mm->context = 0; @@ -301,7 +302,6 @@ static inline int copy_mm(unsigned long clone_flags, struct task_struct * tsk) } retval = -ENOMEM; - mm = mm_alloc(); mm = allocate_mm(); if (!mm) goto fail_nomem; diff --git a/kernel/timer.c b/kernel/timer.c index 92d8af4b5..6b8538715 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -163,9 +163,9 @@ static inline void internal_add_timer(struct timer_list *timer) /* Initialize both explicitly - let's try to have them in the same cache line */ spinlock_t timerlist_lock = SPIN_LOCK_UNLOCKED; -volatile struct timer_list * volatile running_timer = NULL; #ifdef CONFIG_SMP +volatile struct timer_list * volatile running_timer = NULL; #define timer_enter(t) do { running_timer = t; mb(); } while (0) #define timer_exit() do { running_timer = NULL; } while (0) #define timer_is_running(t) (running_timer == t) @@ -173,8 +173,6 @@ volatile struct timer_list * volatile running_timer = NULL; #else #define timer_enter(t) do { } while (0) #define timer_exit() do { } while (0) -#define timer_is_running(t) (0) -#define timer_synchronize(t) do { (void)(t); barrier(); } while(0) #endif void add_timer(struct timer_list *timer) |