diff --git a/[refs] b/[refs] index 5591886e27cc..112c16efeab0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd699c76552bbfa66631f019be415a87dbb08237 +refs/heads/master: 75a9cac430a1bd2a5219c74508ca01b0ddfddc9a diff --git a/trunk/arch/x86/kernel/olpc_ofw.c b/trunk/arch/x86/kernel/olpc_ofw.c index 469ee4384295..f5d499fbe74f 100644 --- a/trunk/arch/x86/kernel/olpc_ofw.c +++ b/trunk/arch/x86/kernel/olpc_ofw.c @@ -35,6 +35,8 @@ void __init setup_olpc_ofw_pgd(void) /* install OFW's PDE permanently into the kernel's pgtable */ set_pgd(&swapper_pg_dir[OLPC_OFW_PDE_NR], *ofw_pde); + /* implicit optimization barrier here due to uninline function return */ + early_iounmap(base, sizeof(olpc_ofw_pgd) * PTRS_PER_PGD); }