[kernel] r21721 - in dists/trunk/linux/debian: . config/kernelarch-powerpc

[Bastian Blank]

Author: waldi
Date: Sat Aug  9 19:42:11 2014
New Revision: 21721

Log:
* 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.

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64
   dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64-le

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Aug  9 19:41:37 2014	(r21720)
+++ dists/trunk/linux/debian/changelog	Sat Aug  9 19:42:11 2014	(r21721)
@@ -16,6 +16,7 @@
   * [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)

Modified: dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64	Sat Aug  9 19:41:37 2014	(r21720)
+++ dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64	Sat Aug  9 19:42:11 2014	(r21721)
@@ -6,7 +6,7 @@
 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"

Modified: dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64-le
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64-le	Sat Aug  9 19:41:37 2014	(r21720)
+++ dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64-le	Sat Aug  9 19:42:11 2014	(r21721)
@@ -1,12 +1,4 @@
 ##
-## 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
 ##
 CONFIG_NR_CPUS=2048