powerpc: Remove CONFIG_HIGHMEM

CONFIG_HIGHMEM is being depracated, remove it.

To accomodate boards with up to 1Gbytes RAM, PAGE_OFFSET and
TASK_SIZE is adjusted to 0xb0000000 (a0000000 on book3s/32 with modules).

If you have more than 1Gbytes of RAM you can adjust CONFIG_LOWMEM_SIZE.

Signed-off-by: Christophe Leroy <[email protected]>

Author: chleroy

arch/powerpc/Kconfig

@@ -482,11 +482,6 @@ source "arch/powerpc/platforms/Kconfig"
 
 menu "Kernel options"
 
-config HIGHMEM
-	bool "High memory support"
-	depends on PPC32
-	select KMAP_LOCAL
-
 source "kernel/Kconfig.hz"
 
 config MATH_EMULATION
@@ -1193,7 +1188,7 @@ config LOWMEM_SIZE_BOOL
 
 config LOWMEM_SIZE
 	hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL
-	default "0x30000000"
+	default "0x40000000"
 
 config LOWMEM_CAM_NUM_BOOL
 	bool "Set number of CAMs to use to map low memory"
@@ -1245,7 +1240,7 @@ config PAGE_OFFSET_BOOL
 
 config PAGE_OFFSET
 	hex "Virtual address of memory base" if PAGE_OFFSET_BOOL
-	default "0xc0000000"
+	default "0xb0000000"
 
 config KERNEL_START_BOOL
 	bool "Set custom kernel base address"
@@ -1261,8 +1256,8 @@ config KERNEL_START_BOOL
 config KERNEL_START
 	hex "Virtual address of kernel base" if KERNEL_START_BOOL
 	default PAGE_OFFSET if PAGE_OFFSET_BOOL
-	default "0xc2000000" if CRASH_DUMP && !NONSTATIC_KERNEL
-	default "0xc0000000"
+	default "0xb2000000" if CRASH_DUMP && !NONSTATIC_KERNEL
+	default "0xb0000000"
 
 config PHYSICAL_START_BOOL
 	bool "Set physical address where the kernel is loaded"
@@ -1298,8 +1293,8 @@ config TASK_SIZE_BOOL
 config TASK_SIZE
 	hex "Size of user task space" if TASK_SIZE_BOOL
 	default "0x80000000" if PPC_8xx
-	default "0xb0000000" if PPC_BOOK3S_32 && EXECMEM
-	default "0xc0000000"
+	default "0xa0000000" if PPC_BOOK3S_32 && EXECMEM
+	default "0xb0000000"
 
 config MODULES_SIZE_BOOL
 	bool "Set custom size for modules/execmem area"

arch/powerpc/configs/44x/akebono_defconfig

@@ -14,7 +14,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PPC_47x=y
 # CONFIG_EBONY is not set
 CONFIG_AKEBONO=y
-CONFIG_HIGHMEM=y
 CONFIG_HZ_100=y
 CONFIG_IRQ_ALL_CPUS=y
 # CONFIG_COMPACTION is not set

arch/powerpc/configs/44x/currituck_defconfig

@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PPC_47x=y
 # CONFIG_EBONY is not set
 CONFIG_CURRITUCK=y
-CONFIG_HIGHMEM=y
 CONFIG_HZ_100=y
 CONFIG_MATH_EMULATION=y
 CONFIG_IRQ_ALL_CPUS=y

arch/powerpc/configs/44x/icon_defconfig

@@ -8,7 +8,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_EBONY is not set
 CONFIG_ICON=y
-CONFIG_HIGHMEM=y
 CONFIG_PCIEPORTBUS=y
 # CONFIG_PCIEASPM is not set
 CONFIG_NET=y

arch/powerpc/configs/85xx-32bit.config

@@ -1,5 +1,4 @@
 CONFIG_PPC64=n
-CONFIG_HIGHMEM=y
 CONFIG_KEXEC=y
 CONFIG_PPC_85xx=y
 CONFIG_PROC_KCORE=y

arch/powerpc/configs/85xx/ge_imp3a_defconfig

@@ -23,7 +23,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_GE_IMP3A=y
 CONFIG_QE_GPIO=y
 CONFIG_CPM2=y
-CONFIG_HIGHMEM=y
 CONFIG_HZ_1000=y
 CONFIG_PREEMPT=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

arch/powerpc/configs/85xx/ksi8560_defconfig

@@ -9,7 +9,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_KSI8560=y
 CONFIG_CPM2=y
 CONFIG_GEN_RTC=y
-CONFIG_HIGHMEM=y
 CONFIG_BINFMT_MISC=y
 CONFIG_MATH_EMULATION=y
 # CONFIG_SECCOMP is not set

arch/powerpc/configs/85xx/ppa8548_defconfig

@@ -10,15 +10,8 @@ CONFIG_RAPIDIO_ENUM_BASIC=y
 CONFIG_RAPIDIO_CPS_XX=y
 CONFIG_RAPIDIO_CPS_GEN2=y
 CONFIG_ADVANCED_OPTIONS=y
-CONFIG_LOWMEM_SIZE_BOOL=y
-CONFIG_LOWMEM_SIZE=0x40000000
 CONFIG_LOWMEM_CAM_NUM_BOOL=y
 CONFIG_LOWMEM_CAM_NUM=4
-CONFIG_PAGE_OFFSET_BOOL=y
-CONFIG_PAGE_OFFSET=0xb0000000
-CONFIG_KERNEL_START_BOOL=y
-CONFIG_TASK_SIZE_BOOL=y
-CONFIG_TASK_SIZE=0xb0000000
 CONFIG_NET=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y

arch/powerpc/configs/85xx/stx_gp3_defconfig

@@ -7,7 +7,6 @@ CONFIG_MODULES=y
 CONFIG_MODVERSIONS=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_STX_GP3=y
-CONFIG_HIGHMEM=y
 CONFIG_BINFMT_MISC=m
 CONFIG_MATH_EMULATION=y
 CONFIG_PCI=y

arch/powerpc/configs/85xx/tqm8548_defconfig

@@ -11,7 +11,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_MSDOS_PARTITION is not set
 CONFIG_TQM8548=y
-CONFIG_HIGHMEM=y
 CONFIG_BINFMT_MISC=y
 CONFIG_MATH_EMULATION=y
 # CONFIG_SECCOMP is not set