diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 12:09:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 12:09:43 -0400 |
commit | 713c0515a555952d53956196d47dec3a3ece860a (patch) | |
tree | 52ef61f6dbb338ad64e24662da859265d0c87a4d /arch/parisc/kernel/unaligned.c | |
parent | 8f40f672e6bb071812f61bfbd30efc3fc1263ad1 (diff) | |
parent | c913f94d86d75492af6222d268c53df236194afb (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
arch/parisc/kernel/perf_asm.S: build fix
parisc: remove -traditional from assembler flags
parisc: use conditional macro for 64-bit wide ops
parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
arch/parisc/kernel/unaligned.c: use time_* macros
parisc: remove redundant display of free swap space in show_mem()
drivers/parisc: replace remaining __FUNCTION__ occurrences
parisc: replace remaining __FUNCTION__ occurrences
parisc: new termios definitions
parisc: fix trivial section name warnings
Diffstat (limited to 'arch/parisc/kernel/unaligned.c')
-rw-r--r-- | arch/parisc/kernel/unaligned.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index aebf3c168871..e6f4b7a4b7e3 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c | |||
@@ -30,7 +30,7 @@ | |||
30 | /* #define DEBUG_UNALIGNED 1 */ | 30 | /* #define DEBUG_UNALIGNED 1 */ |
31 | 31 | ||
32 | #ifdef DEBUG_UNALIGNED | 32 | #ifdef DEBUG_UNALIGNED |
33 | #define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __FUNCTION__ ); printk(KERN_DEBUG fmt, ##args ); } while (0) | 33 | #define DPRINTF(fmt, args...) do { printk(KERN_DEBUG "%s:%d:%s ", __FILE__, __LINE__, __func__ ); printk(KERN_DEBUG fmt, ##args ); } while (0) |
34 | #else | 34 | #else |
35 | #define DPRINTF(fmt, args...) | 35 | #define DPRINTF(fmt, args...) |
36 | #endif | 36 | #endif |
@@ -460,7 +460,8 @@ void handle_unaligned(struct pt_regs *regs) | |||
460 | goto force_sigbus; | 460 | goto force_sigbus; |
461 | } | 461 | } |
462 | 462 | ||
463 | if (unaligned_count > 5 && jiffies - last_time > 5*HZ) { | 463 | if (unaligned_count > 5 && |
464 | time_after(jiffies, last_time + 5 * HZ)) { | ||
464 | unaligned_count = 0; | 465 | unaligned_count = 0; |
465 | last_time = jiffies; | 466 | last_time = jiffies; |
466 | } | 467 | } |