1 |
From 3dcfb729b5f4a0c9b50742865cd5e6c4dbcc80dc Mon Sep 17 00:00:00 2001 |
2 |
From: Helge Deller <deller@gmx.de> |
3 |
Date: Fri, 19 Aug 2022 19:30:50 +0200 |
4 |
Subject: parisc: Make CONFIG_64BIT available for ARCH=parisc64 only |
5 |
|
6 |
From: Helge Deller <deller@gmx.de> |
7 |
|
8 |
commit 3dcfb729b5f4a0c9b50742865cd5e6c4dbcc80dc upstream. |
9 |
|
10 |
With this patch the ARCH= parameter decides if the |
11 |
CONFIG_64BIT option will be set or not. This means, the |
12 |
ARCH= parameter will give: |
13 |
|
14 |
ARCH=parisc -> 32-bit kernel |
15 |
ARCH=parisc64 -> 64-bit kernel |
16 |
|
17 |
This simplifies the usage of the other config options like |
18 |
randconfig, allmodconfig and allyesconfig a lot and produces |
19 |
the output which is expected for parisc64 (64-bit) vs. parisc (32-bit). |
20 |
|
21 |
Suggested-by: Masahiro Yamada <masahiroy@kernel.org> |
22 |
Signed-off-by: Helge Deller <deller@gmx.de> |
23 |
Tested-by: Randy Dunlap <rdunlap@infradead.org> |
24 |
Reviewed-by: Randy Dunlap <rdunlap@infradead.org> |
25 |
Cc: <stable@vger.kernel.org> # 5.15+ |
26 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
27 |
--- |
28 |
arch/parisc/Kconfig | 21 ++++++--------------- |
29 |
1 file changed, 6 insertions(+), 15 deletions(-) |
30 |
|
31 |
--- a/arch/parisc/Kconfig |
32 |
+++ b/arch/parisc/Kconfig |
33 |
@@ -147,10 +147,10 @@ menu "Processor type and features" |
34 |
|
35 |
choice |
36 |
prompt "Processor type" |
37 |
- default PA7000 |
38 |
+ default PA7000 if "$(ARCH)" = "parisc" |
39 |
|
40 |
config PA7000 |
41 |
- bool "PA7000/PA7100" |
42 |
+ bool "PA7000/PA7100" if "$(ARCH)" = "parisc" |
43 |
help |
44 |
This is the processor type of your CPU. This information is |
45 |
used for optimizing purposes. In order to compile a kernel |
46 |
@@ -161,21 +161,21 @@ config PA7000 |
47 |
which is required on some machines. |
48 |
|
49 |
config PA7100LC |
50 |
- bool "PA7100LC" |
51 |
+ bool "PA7100LC" if "$(ARCH)" = "parisc" |
52 |
help |
53 |
Select this option for the PCX-L processor, as used in the |
54 |
712, 715/64, 715/80, 715/100, 715/100XC, 725/100, 743, 748, |
55 |
D200, D210, D300, D310 and E-class |
56 |
|
57 |
config PA7200 |
58 |
- bool "PA7200" |
59 |
+ bool "PA7200" if "$(ARCH)" = "parisc" |
60 |
help |
61 |
Select this option for the PCX-T' processor, as used in the |
62 |
C100, C110, J100, J110, J210XC, D250, D260, D350, D360, |
63 |
K100, K200, K210, K220, K400, K410 and K420 |
64 |
|
65 |
config PA7300LC |
66 |
- bool "PA7300LC" |
67 |
+ bool "PA7300LC" if "$(ARCH)" = "parisc" |
68 |
help |
69 |
Select this option for the PCX-L2 processor, as used in the |
70 |
744, A180, B132L, B160L, B180L, C132L, C160L, C180L, |
71 |
@@ -225,17 +225,8 @@ config MLONGCALLS |
72 |
Enabling this option will probably slow down your kernel. |
73 |
|
74 |
config 64BIT |
75 |
- bool "64-bit kernel" |
76 |
+ def_bool "$(ARCH)" = "parisc64" |
77 |
depends on PA8X00 |
78 |
- help |
79 |
- Enable this if you want to support 64bit kernel on PA-RISC platform. |
80 |
- |
81 |
- At the moment, only people willing to use more than 2GB of RAM, |
82 |
- or having a 64bit-only capable PA-RISC machine should say Y here. |
83 |
- |
84 |
- Since there is no 64bit userland on PA-RISC, there is no point to |
85 |
- enable this option otherwise. The 64bit kernel is significantly bigger |
86 |
- and slower than the 32bit one. |
87 |
|
88 |
choice |
89 |
prompt "Kernel page size" |