From 737c9c7da818f1da0bdf3f6a0dda5c38a3cba769 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Sep 09 2011 15:22:24 +0000
Subject: Change to 64K page size for ppc64 kernels (rhbz 736751)


---

diff --git a/config-powerpc64 b/config-powerpc64
index f27f5b3..9f042f4 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -108,7 +108,8 @@ CONFIG_NR_CPUS=128
 CONFIG_RTAS_PROC=y
 CONFIG_IOMMU_VMERGE=y
 CONFIG_NUMA=y
-# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC_64K_PAGES=y
+CONFIG_PPC_SUBPAGE_PROT=y
 CONFIG_SCHED_SMT=y
 
 # CONFIG_MV643XX_ETH is not set
diff --git a/kernel.spec b/kernel.spec
index c57c890..742e492 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 0
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2039,6 +2039,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Sep 09 2011 Josh Boyer <jwboyer@redhat.com>
+- Change to 64K page size for ppc64 kernels (rhbz 736751)
+
 * Wed Sep 07 2011 Josh Boyer <jwboyer@redhat.com>
 - Linux 3.1-rc5 (locally generated patch from git as kernel.org is down)
 - Add patch to fix oops when linking entities in ucvideo (rhbz 735437)