diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:46:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:46:55 +0200 |
| commit | af1a34f21150af199f066dfcccbae9830c9429aa (patch) | |
| tree | 313267459418f7bba8510df45ce18d4b4133eb1b /arch/powerpc/kernel/setup-common.c | |
| parent | 39208aa7ecb7d9c4e86df782b5693270313cbab1 (diff) | |
| parent | c7e2f69d3ed2e56de1f5eaaf37c0f5f91d7adb0a (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 0ac741fae90e..2e3bc16d02b2 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -904,9 +904,6 @@ void __init setup_arch(char **cmdline_p) #endif #endif -#ifdef CONFIG_PPC_64K_PAGES - init_mm.context.pte_frag = NULL; -#endif #ifdef CONFIG_SPAPR_TCE_IOMMU mm_iommu_init(&init_mm); #endif |