Messages in this thread Patch in this message | | | From | Joachim Schmitz <> | Subject | 2.1.34: x86_do_profile duplicate (patch) | Date | Tue, 15 Apr 1997 11:47:58 +0200 (MET DST) |
| |
Hi folks
x86_do_profile is defined in two different places (linux-2.1.34/arch/i386/kernel/time.c and linux-2.1.34/arch/i386/kernel/smp.c). This conflicts if __SMP__ is defined (which is by default). Possible fix:
--- linux-2.1.34/arch/i386/kernel/time.c.orig Tue Apr 15 11:32:06 1997 +++ linux-2.1.34/arch/i386/kernel/time.c Tue Apr 15 11:32:11 1997 @@ -365,6 +365,7 @@ static long last_rtc_update = 0; +#ifndef __SMP__ /* * Move this to a header file - right now it shows * up both here and in smp.c @@ -386,6 +387,7 @@ atomic_inc(&prof_buffer[prof_len-1]); } } +#endif /* * timer_interrupt() needs to keep up the real-time clock, -- Bye, Jojo email: work SCHMITZ_JOACHIM@Tandem.COM home Joachim_Schmitz@D.maus.de
| |