diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 16:11:51 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 16:11:51 -0800 |
| commit | 638bee71c83a2837b48062fdc5b222163cf53d79 (patch) | |
| tree | 9c1699c07a5aa547d769138317279b8ee1ba89e8 /arch/x86/kernel/machine_kexec_32.c | |
| parent | 2aaa822984b97efd894d10d1e1382206ef0291a7 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'arch/x86/kernel/machine_kexec_32.c')
| -rw-r--r-- | arch/x86/kernel/machine_kexec_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index 37f420018a4..f5fc8c781a6 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/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 |