From aed63a56b189d771116f2d4b8fe10bbec528e6a2 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 9 Aug 2014 19:42:11 +0000 Subject: [PATCH] * debian/changelog: Update * debian/config/kernelarch-powerpc/config-arch-64: Set PPC_64K_PAGES. * debian/config/kernelarch-powerpc/config-arch-64-le: Remove overriden option. svn path=/dists/trunk/linux/; revision=21721 --- debian/changelog | 1 + debian/config/kernelarch-powerpc/config-arch-64 | 2 +- debian/config/kernelarch-powerpc/config-arch-64-le | 8 -------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index fbbea7a47..c43cc16ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ linux (3.16-1~exp1) UNRELEASED; urgency=medium * [powerpc64, s390x] Enable PCI hotplug. * Enable RTL8723BE. * Enable OPROFILE. + * [ppc64] Enable 64KiB pages. [ Ben Hutchings ] * udeb: Add new sound drivers to sound-modules (thanks to Samuel Thibault) diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64 index 50fb88f59..20604ac98 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64 +++ b/debian/config/kernelarch-powerpc/config-arch-64 @@ -6,7 +6,7 @@ CONFIG_PPC_TRANSACTIONAL_MEM=y CONFIG_IRQ_ALL_CPUS=y CONFIG_NUMA=y ## choice: Page size -# CONFIG_PPC_64K_PAGES is not set +CONFIG_PPC_64K_PAGES=y ## end choice CONFIG_SCHED_SMT=y CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0" diff --git a/debian/config/kernelarch-powerpc/config-arch-64-le b/debian/config/kernelarch-powerpc/config-arch-64-le index 54a8e3d27..dbe0a4183 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64-le +++ b/debian/config/kernelarch-powerpc/config-arch-64-le @@ -1,11 +1,3 @@ -## -## file: arch/powerpc/Kconfig -## -## choice: Page size -# CONFIG_PPC_4K_PAGES is not set -CONFIG_PPC_64K_PAGES=y -## end choice - ## ## file: arch/powerpc/platforms/Kconfig.cputype ##