Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[muen/linux.git] / arch / x86 / mm / fault.c

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index a3fd94eff04d68eaf1a5aa525c515588b2f2aff7..9a84a0d08727b7452ebea1e2e35b5ad3eb0b6e79 100644 (file)
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -209,6 +209,7 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
        unsigned lsb = 0;
        siginfo_t info;
 
+       clear_siginfo(&info);
        info.si_signo   = si_signo;
        info.si_errno   = 0;
        info.si_code    = si_code;
@@ -439,7 +440,7 @@ static noinline int vmalloc_fault(unsigned long address)
        if (pgd_none(*pgd_k))
                return -1;
 
-       if (pgtable_l5_enabled) {
+       if (pgtable_l5_enabled()) {
                if (pgd_none(*pgd)) {
                        set_pgd(pgd, *pgd_k);
                        arch_flush_lazy_mmu_mode();
@@ -454,7 +455,7 @@ static noinline int vmalloc_fault(unsigned long address)
        if (p4d_none(*p4d_k))
                return -1;
 
-       if (p4d_none(*p4d) && !pgtable_l5_enabled) {
+       if (p4d_none(*p4d) && !pgtable_l5_enabled()) {
                set_p4d(p4d, *p4d_k);
                arch_flush_lazy_mmu_mode();
        } else {