git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
arch
/
sparc64
/
kernel
/
unaligned.c
diff --git
a/arch/sparc64/kernel/unaligned.c
b/arch/sparc64/kernel/unaligned.c
index
dc7bf1b
..
203ddfa
100644
(file)
--- a/
arch/sparc64/kernel/unaligned.c
+++ b/
arch/sparc64/kernel/unaligned.c
@@
-1,12
+1,13
@@
-/*
$Id: unaligned.c,v 1.24 2002/02/09 19:49:31 davem Exp $
+/*
* unaligned.c: Unaligned load/store trap handling with special
* cases for the kernel to do them more quickly.
*
* unaligned.c: Unaligned load/store trap handling with special
* cases for the kernel to do them more quickly.
*
- * Copyright (C) 1996
David S. Miller (davem@caip.rutgers.edu
)
+ * Copyright (C) 1996
,2008 David S. Miller (davem@davemloft.net
)
* Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/
* Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/
+#include <linux/jiffies.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/mm.h>
@@
-19,7
+20,6
@@
#include <asm/uaccess.h>
#include <linux/smp.h>
#include <linux/bitops.h>
#include <asm/uaccess.h>
#include <linux/smp.h>
#include <linux/bitops.h>
-#include <linux/kallsyms.h>
#include <asm/fpumacro.h>
/* #define DEBUG_MNA */
#include <asm/fpumacro.h>
/* #define DEBUG_MNA */
@@
-283,13
+283,13
@@
static void log_unaligned(struct pt_regs *regs)
{
static unsigned long count, last_time;
{
static unsigned long count, last_time;
- if (
jiffies - last_time > 5 * HZ
)
+ if (
time_after(jiffies, last_time + 5 * HZ)
)
count = 0;
if (count < 5) {
last_time = jiffies;
count++;
count = 0;
if (count < 5) {
last_time = jiffies;
count++;
- printk("Kernel unaligned access at TPC[%lx]
", regs->tpc);
-
print_symbol("%s\n",
regs->tpc);
+ printk("Kernel unaligned access at TPC[%lx]
%pS\n",
+
regs->tpc, (void *)
regs->tpc);
}
}
}
}