lkml.org 
[lkml]   [2003]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
Date
From
Subject[PATCH] two PPC patches for 2.5.73
Hi,

here are two patches for kernel 2.5.73.
compile.diff is needed for the kernel to compile.
time.diff fixes uptime being wrong; I hope it's correct.

--
\|/ ____ \|/ Colin
"@'/ ,. \`@" http://www.geekounet.org/
/_| \__/ |_\
\__U_/
--- arch/ppc/kernel/traps.c.orig Sun Jul 6 02:36:56 2003
+++ arch/ppc/kernel/traps.c Sun Jul 6 02:36:49 2003
@@ -346,6 +346,12 @@
return 0;
}

+void
+show_stack(struct task_struct *task, unsigned long * sp)
+{
+ printk(KERN_CRIT "arch/ppc/kernel/traps.c::show_stack() called but not implemented!\n");
+}
+
void
ProgramCheckException(struct pt_regs *regs)
{--- arch/ppc/kernel/time.c.orig Sun Jul 6 02:35:18 2003
+++ arch/ppc/kernel/time.c Sun Jul 6 02:20:27 2003
@@ -277,6 +277,18 @@
xtime.tv_nsec = new_nsec;
xtime.tv_sec = new_sec;

+ wall_to_monotonic.tv_sec += xtime.tv_sec - tv->tv_sec;
+ wall_to_monotonic.tv_nsec += xtime.tv_nsec - tv->tv_nsec;
+
+ if (wall_to_monotonic.tv_nsec > NSEC_PER_SEC) {
+ wall_to_monotonic.tv_nsec -= NSEC_PER_SEC;
+ wall_to_monotonic.tv_sec++;
+ }
+ if (wall_to_monotonic.tv_nsec < 0) {
+ wall_to_monotonic.tv_nsec += NSEC_PER_SEC;
+ wall_to_monotonic.tv_sec--;
+ }
+
/* In case of a large backwards jump in time with NTP, we want the
* clock to be updated as soon as the PLL is again in lock.
*/
@@ -347,6 +359,8 @@
sys_tz.tz_dsttime = 0;
xtime.tv_sec -= time_offset;
}
+ wall_to_monotonic.tv_sec = -xtime.tv_sec;
+ wall_to_monotonic.tv_nsec = -xtime.tv_nsec;
}

#define FEBRUARY 2
@@ -427,4 +441,14 @@
if (err <= inscale/2) mlt++;
return mlt;
}
+
+/* monotonic_clock(): returns # of nanoseconds passed since time_init()
+ * Note: This function is required to return accurate
+ * time even in the absence of multiple timer ticks.
+ */
+unsigned long long monotonic_clock(void)
+{
+ return xtime.tv_sec * NSEC_PER_SEC + xtime.tv_nsec;
+}
+EXPORT_SYMBOL(monotonic_clock);
\
 
 \ /
  Last update: 2005-03-22 13:46    [W:0.210 / U:0.852 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site