From db3c1249e445b8c5923c22603cd471c4211efab9 Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Sun, 22 Feb 2009 01:00:57 +0100
Subject: [PATCH] --- yaml --- r: 136921 b: refs/heads/master c:
 fc6fcdfbb8f1b2553255170f221cd57a4108591f h: refs/heads/master i:   136919:
 07ce6c8981285a874beaaded572f4ac86fe23690 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/kernel/machine_kexec_32.c | 2 +-
 trunk/arch/x86/kernel/traps.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 614496a06f42..504f85307b86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdb17aeb28aaad3eae5ef57e70cb287d34d1049d
+refs/heads/master: fc6fcdfbb8f1b2553255170f221cd57a4108591f
diff --git a/trunk/arch/x86/kernel/machine_kexec_32.c b/trunk/arch/x86/kernel/machine_kexec_32.c
index 37f420018a41..f5fc8c781a62 100644
--- a/trunk/arch/x86/kernel/machine_kexec_32.c
+++ b/trunk/arch/x86/kernel/machine_kexec_32.c
@@ -121,7 +121,7 @@ static void machine_kexec_page_table_set_one(
 static void machine_kexec_prepare_page_tables(struct kimage *image)
 {
 	void *control_page;
-	pmd_t *pmd = 0;
+	pmd_t *pmd = NULL;
 
 	control_page = page_address(image->control_code_page);
 #ifdef CONFIG_X86_PAE
diff --git a/trunk/arch/x86/kernel/traps.c b/trunk/arch/x86/kernel/traps.c
index acb8c0585ab9..2df927b5003f 100644
--- a/trunk/arch/x86/kernel/traps.c
+++ b/trunk/arch/x86/kernel/traps.c
@@ -942,7 +942,7 @@ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code)
 	info.si_signo = SIGILL;
 	info.si_errno = 0;
 	info.si_code = ILL_BADSTK;
-	info.si_addr = 0;
+	info.si_addr = NULL;
 	if (notify_die(DIE_TRAP, "iret exception",
 			regs, error_code, 32, SIGILL) == NOTIFY_STOP)
 		return;