From e9860261cb674cad9d32083933c60d5be4f7ca26 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 14 Nov 2008 10:38:40 +1100
Subject: [PATCH] --- yaml --- r: 120663 b: refs/heads/master c:
 350b4da71f8326b9319ada7b701f2bce2e1285b7 h: refs/heads/master i:   120661:
 ecfa61c6278c92eaa4861f1c959471800fdafed2   120659:
 0fc704b15c1e4cde3866dbed9f8497c3d28e1fdd   120655:
 48bce6f4fb1748810d4014c1cfd9855f03de50c1 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/mm/fault.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fee75c421227..aac65d49ff13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e54237053204caebacb3eda3d37363f1a6118707
+refs/heads/master: 350b4da71f8326b9319ada7b701f2bce2e1285b7
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index 31e8730fa246..3a1b6ef4f05d 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -393,7 +393,7 @@ static void show_fault_oops(struct pt_regs *regs, unsigned long error_code,
 		if (pte && pte_present(*pte) && !pte_exec(*pte))
 			printk(KERN_CRIT "kernel tried to execute "
 				"NX-protected page - exploit attempt? "
-				"(uid: %d)\n", current->uid);
+				"(uid: %d)\n", current_uid());
 	}
 #endif