Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198397
b: refs/heads/master
c: 7aa5cca
h: refs/heads/master
i:
  198395: 62dd311
v: v3
  • Loading branch information
Andrea Gelmini authored and Greg Ungerer committed May 24, 2010
1 parent cf8b7ff commit 6c25b88
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 73a9983e6f77e347a8e04861c0d55936c01ce217
refs/heads/master: 7aa5ccaae6ae6cdf6973df3378fc63b508944ce6
10 changes: 5 additions & 5 deletions trunk/arch/m68knommu/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* linux/arch/m68knommu/mm/fault.c
*
* Copyright (C) 1998 D. Jeff Dionne <jeff@lineo.ca>,
* Copyright (C) 2000 Lineo, Inc. (www.lineo.com)
* Copyright (C) 2000 Lineo, Inc. (www.lineo.com)
*
* Based on:
*
Expand Down Expand Up @@ -36,19 +36,19 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
unsigned long error_code)
{
#ifdef DEBUG
printk (KERN_DEBUG "regs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld\n",
printk(KERN_DEBUG "regs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld\n",
regs->sr, regs->pc, address, error_code);
#endif

/*
* Oops. The kernel tried to access some bad page. We'll have to
* terminate things with extreme prejudice.
*/
if ((unsigned long) address < PAGE_SIZE) {
if ((unsigned long) address < PAGE_SIZE)
printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
} else
else
printk(KERN_ALERT "Unable to handle kernel access");
printk(KERN_ALERT " at virtual address %08lx\n",address);
printk(KERN_ALERT " at virtual address %08lx\n", address);
die_if_kernel("Oops", regs, error_code);
do_exit(SIGKILL);

Expand Down

0 comments on commit 6c25b88

Please sign in to comment.