diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:49:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:49:01 +0000 |
| commit | d221c44b7afefd8f77f8595af468dfacb3b21cc2 (patch) | |
| tree | ef1c7aa4fe157c9f63be777cc6809f292da1f5d5 /kernel | |
| parent | 51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (diff) | |
Merge with Linux 2.3.8.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 2 | ||||
| -rw-r--r-- | kernel/ksyms.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index e85429ba4..bf44bd04c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -613,7 +613,7 @@ int do_fork(unsigned long clone_flags, unsigned long usp, struct pt_regs *regs) { int i; p->has_cpu = 0; - p->processor = NO_PROC_ID; + p->processor = current->processor; /* ?? should we just memset this ?? */ for(i = 0; i < smp_num_cpus; i++) p->per_cpu_utime[i] = p->per_cpu_stime[i] = 0; diff --git a/kernel/ksyms.c b/kernel/ksyms.c index a57d67d8b..0d4e2bee2 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -355,7 +355,6 @@ EXPORT_SYMBOL(read_exec); EXPORT_SYMBOL(si_meminfo); /* Added to make file system as module */ -EXPORT_SYMBOL(set_writetime); EXPORT_SYMBOL(sys_tz); EXPORT_SYMBOL(__wait_on_super); EXPORT_SYMBOL(file_fsync); |