diff options
author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /arch/powerpc/mm | |
parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 565b7a237c84..866098686da8 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
@@ -339,7 +339,7 @@ bad_area_nosemaphore: | |||
339 | && printk_ratelimit()) | 339 | && printk_ratelimit()) |
340 | printk(KERN_CRIT "kernel tried to execute NX-protected" | 340 | printk(KERN_CRIT "kernel tried to execute NX-protected" |
341 | " page (%lx) - exploit attempt? (uid: %d)\n", | 341 | " page (%lx) - exploit attempt? (uid: %d)\n", |
342 | address, current->uid); | 342 | address, current_uid()); |
343 | 343 | ||
344 | return SIGSEGV; | 344 | return SIGSEGV; |
345 | 345 | ||