diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 09:05:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 09:05:05 +0200 |
| commit | 9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2 (patch) | |
| tree | 7a595ccc67ae0cd9a414383ff2f6ede291c7dc18 /arch/powerpc/kernel/setup-common.c | |
| parent | bccf1da3546cc7aeefadc63cd4356ab8dc04c1e3 (diff) | |
| parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
| download | linux-0-day-9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2.tar.gz linux-0-day-9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2.tar.xz | |
Merge 4.14-rc4 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 0ac741fae90ea..2e3bc16d02b28 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 |