* [PATCH] two PPC patches for 2.5.73
@ 2003-07-06 0:39 Colin Leroy
2003-07-07 16:18 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Colin Leroy @ 2003-07-06 0:39 UTC (permalink / raw)
To: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
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_/
[-- Attachment #2: compile.diff --]
[-- Type: text/plain, Size: 367 bytes --]
--- 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)
{
[-- Attachment #3: time.diff --]
[-- Type: text/plain, Size: 1298 bytes --]
--- 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);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] two PPC patches for 2.5.73
2003-07-06 0:39 [PATCH] two PPC patches for 2.5.73 Colin Leroy
@ 2003-07-07 16:18 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2003-07-07 16:18 UTC (permalink / raw)
To: Colin Leroy; +Cc: linux-kernel
On Sun, Jul 06, 2003 at 02:39:22AM +0200, Colin Leroy wrote:
> 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.
In the future, PPC changes should be sent to the linuxppc-dev list at
lists.linuxppc.org, and this has already been fixed in the linuxppc-2.5
tree (which has all of the changes ready to goto Linus, as well as stuff
being worked on for PPC, etc). This tree is at
bk://ppc.bkbits.net/linuxppc-2.5 or
rsync://source.mvista.com/linuxppc-2.5
--
Tom Rini
http://gate.crashing.org/~trini/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-07-07 16:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-06 0:39 [PATCH] two PPC patches for 2.5.73 Colin Leroy
2003-07-07 16:18 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).