Skip to content

Commit 920e2a7

Browse files
committed
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]>
1 parent 4d5be09 commit 920e2a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+33
-308
lines changed

arch/powerpc/Kconfig

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -482,11 +482,6 @@ source "arch/powerpc/platforms/Kconfig"
482482

483483
menu "Kernel options"
484484

485-
config HIGHMEM
486-
bool "High memory support"
487-
depends on PPC32
488-
select KMAP_LOCAL
489-
490485
source "kernel/Kconfig.hz"
491486

492487
config MATH_EMULATION
@@ -1193,7 +1188,7 @@ config LOWMEM_SIZE_BOOL
11931188

11941189
config LOWMEM_SIZE
11951190
hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL
1196-
default "0x30000000"
1191+
default "0x40000000"
11971192

11981193
config LOWMEM_CAM_NUM_BOOL
11991194
bool "Set number of CAMs to use to map low memory"
@@ -1245,7 +1240,7 @@ config PAGE_OFFSET_BOOL
12451240

12461241
config PAGE_OFFSET
12471242
hex "Virtual address of memory base" if PAGE_OFFSET_BOOL
1248-
default "0xc0000000"
1243+
default "0xb0000000"
12491244

12501245
config KERNEL_START_BOOL
12511246
bool "Set custom kernel base address"
@@ -1261,8 +1256,8 @@ config KERNEL_START_BOOL
12611256
config KERNEL_START
12621257
hex "Virtual address of kernel base" if KERNEL_START_BOOL
12631258
default PAGE_OFFSET if PAGE_OFFSET_BOOL
1264-
default "0xc2000000" if CRASH_DUMP && !NONSTATIC_KERNEL
1265-
default "0xc0000000"
1259+
default "0xb2000000" if CRASH_DUMP && !NONSTATIC_KERNEL
1260+
default "0xb0000000"
12661261

12671262
config PHYSICAL_START_BOOL
12681263
bool "Set physical address where the kernel is loaded"
@@ -1298,8 +1293,8 @@ config TASK_SIZE_BOOL
12981293
config TASK_SIZE
12991294
hex "Size of user task space" if TASK_SIZE_BOOL
13001295
default "0x80000000" if PPC_8xx
1301-
default "0xb0000000" if PPC_BOOK3S_32 && EXECMEM
1302-
default "0xc0000000"
1296+
default "0xa0000000" if PPC_BOOK3S_32 && EXECMEM
1297+
default "0xb0000000"
13031298

13041299
config MODULES_SIZE_BOOL
13051300
bool "Set custom size for modules/execmem area"

arch/powerpc/configs/44x/akebono_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ CONFIG_MODULE_UNLOAD=y
1414
CONFIG_PPC_47x=y
1515
# CONFIG_EBONY is not set
1616
CONFIG_AKEBONO=y
17-
CONFIG_HIGHMEM=y
1817
CONFIG_HZ_100=y
1918
CONFIG_IRQ_ALL_CPUS=y
2019
# CONFIG_COMPACTION is not set

arch/powerpc/configs/44x/currituck_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y
1212
CONFIG_PPC_47x=y
1313
# CONFIG_EBONY is not set
1414
CONFIG_CURRITUCK=y
15-
CONFIG_HIGHMEM=y
1615
CONFIG_HZ_100=y
1716
CONFIG_MATH_EMULATION=y
1817
CONFIG_IRQ_ALL_CPUS=y

arch/powerpc/configs/44x/icon_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ CONFIG_MODULES=y
88
CONFIG_MODULE_UNLOAD=y
99
# CONFIG_EBONY is not set
1010
CONFIG_ICON=y
11-
CONFIG_HIGHMEM=y
1211
CONFIG_PCIEPORTBUS=y
1312
# CONFIG_PCIEASPM is not set
1413
CONFIG_NET=y

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
CONFIG_PPC64=n
2-
CONFIG_HIGHMEM=y
32
CONFIG_KEXEC=y
43
CONFIG_PPC_85xx=y
54
CONFIG_PROC_KCORE=y

arch/powerpc/configs/85xx/ge_imp3a_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ CONFIG_MODULE_UNLOAD=y
2323
CONFIG_GE_IMP3A=y
2424
CONFIG_QE_GPIO=y
2525
CONFIG_CPM2=y
26-
CONFIG_HIGHMEM=y
2726
CONFIG_HZ_1000=y
2827
CONFIG_PREEMPT=y
2928
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

arch/powerpc/configs/85xx/ksi8560_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ CONFIG_PARTITION_ADVANCED=y
99
CONFIG_KSI8560=y
1010
CONFIG_CPM2=y
1111
CONFIG_GEN_RTC=y
12-
CONFIG_HIGHMEM=y
1312
CONFIG_BINFMT_MISC=y
1413
CONFIG_MATH_EMULATION=y
1514
# CONFIG_SECCOMP is not set

arch/powerpc/configs/85xx/ppa8548_defconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,8 @@ CONFIG_RAPIDIO_ENUM_BASIC=y
1010
CONFIG_RAPIDIO_CPS_XX=y
1111
CONFIG_RAPIDIO_CPS_GEN2=y
1212
CONFIG_ADVANCED_OPTIONS=y
13-
CONFIG_LOWMEM_SIZE_BOOL=y
14-
CONFIG_LOWMEM_SIZE=0x40000000
1513
CONFIG_LOWMEM_CAM_NUM_BOOL=y
1614
CONFIG_LOWMEM_CAM_NUM=4
17-
CONFIG_PAGE_OFFSET_BOOL=y
18-
CONFIG_PAGE_OFFSET=0xb0000000
19-
CONFIG_KERNEL_START_BOOL=y
20-
CONFIG_TASK_SIZE_BOOL=y
21-
CONFIG_TASK_SIZE=0xb0000000
2215
CONFIG_NET=y
2316
CONFIG_INET=y
2417
CONFIG_IP_PNP=y

arch/powerpc/configs/85xx/stx_gp3_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ CONFIG_MODULES=y
77
CONFIG_MODVERSIONS=y
88
# CONFIG_BLK_DEV_BSG is not set
99
CONFIG_STX_GP3=y
10-
CONFIG_HIGHMEM=y
1110
CONFIG_BINFMT_MISC=m
1211
CONFIG_MATH_EMULATION=y
1312
CONFIG_PCI=y

arch/powerpc/configs/85xx/tqm8548_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ CONFIG_MODULE_UNLOAD=y
1111
CONFIG_PARTITION_ADVANCED=y
1212
# CONFIG_MSDOS_PARTITION is not set
1313
CONFIG_TQM8548=y
14-
CONFIG_HIGHMEM=y
1514
CONFIG_BINFMT_MISC=y
1615
CONFIG_MATH_EMULATION=y
1716
# CONFIG_SECCOMP is not set

0 commit comments

Comments
 (0)