diff options
-rw-r--r-- | arch/parisc/configs/712_defconfig | 41 | ||||
-rw-r--r-- | arch/parisc/configs/a500_defconfig | 50 | ||||
-rw-r--r-- | arch/parisc/configs/b180_defconfig | 17 | ||||
-rw-r--r-- | arch/parisc/configs/c3000_defconfig | 38 | ||||
-rw-r--r-- | arch/parisc/configs/c8000_defconfig | 17 | ||||
-rw-r--r-- | arch/parisc/configs/default_defconfig | 49 | ||||
-rw-r--r-- | arch/parisc/configs/generic-32bit_defconfig | 21 | ||||
-rw-r--r-- | arch/parisc/configs/generic-64bit_defconfig | 48 | ||||
-rw-r--r-- | arch/parisc/include/asm/pdcpat.h | 16 | ||||
-rw-r--r-- | arch/parisc/kernel/cache.c | 36 | ||||
-rw-r--r-- | arch/parisc/kernel/firmware.c | 36 | ||||
-rw-r--r-- | arch/parisc/kernel/irq.c | 8 | ||||
-rw-r--r-- | arch/parisc/kernel/pdt.c | 23 | ||||
-rw-r--r-- | arch/parisc/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 2 | ||||
-rw-r--r-- | drivers/parisc/pdc_stable.c | 2 |
16 files changed, 152 insertions, 254 deletions
diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig index 143d02652792..ccc109761f44 100644 --- a/arch/parisc/configs/712_defconfig +++ b/arch/parisc/configs/712_defconfig | |||
@@ -1,11 +1,9 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | # CONFIG_LOCALVERSION_AUTO is not set | 1 | # CONFIG_LOCALVERSION_AUTO is not set |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
5 | CONFIG_IKCONFIG=y | 4 | CONFIG_IKCONFIG=y |
6 | CONFIG_IKCONFIG_PROC=y | 5 | CONFIG_IKCONFIG_PROC=y |
7 | CONFIG_LOG_BUF_SHIFT=16 | 6 | CONFIG_LOG_BUF_SHIFT=16 |
8 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
9 | CONFIG_BLK_DEV_INITRD=y | 7 | CONFIG_BLK_DEV_INITRD=y |
10 | CONFIG_KALLSYMS_ALL=y | 8 | CONFIG_KALLSYMS_ALL=y |
11 | CONFIG_SLAB=y | 9 | CONFIG_SLAB=y |
@@ -14,7 +12,6 @@ CONFIG_OPROFILE=m | |||
14 | CONFIG_MODULES=y | 12 | CONFIG_MODULES=y |
15 | CONFIG_MODULE_UNLOAD=y | 13 | CONFIG_MODULE_UNLOAD=y |
16 | CONFIG_MODULE_FORCE_UNLOAD=y | 14 | CONFIG_MODULE_FORCE_UNLOAD=y |
17 | # CONFIG_BLK_DEV_BSG is not set | ||
18 | CONFIG_PA7100LC=y | 15 | CONFIG_PA7100LC=y |
19 | CONFIG_PREEMPT_VOLUNTARY=y | 16 | CONFIG_PREEMPT_VOLUNTARY=y |
20 | CONFIG_GSC_LASI=y | 17 | CONFIG_GSC_LASI=y |
@@ -32,11 +29,9 @@ CONFIG_IP_PNP_DHCP=y | |||
32 | CONFIG_IP_PNP_BOOTP=y | 29 | CONFIG_IP_PNP_BOOTP=y |
33 | CONFIG_INET_AH=m | 30 | CONFIG_INET_AH=m |
34 | CONFIG_INET_ESP=m | 31 | CONFIG_INET_ESP=m |
35 | # CONFIG_INET_LRO is not set | ||
36 | CONFIG_INET_DIAG=m | 32 | CONFIG_INET_DIAG=m |
37 | # CONFIG_IPV6 is not set | 33 | # CONFIG_IPV6 is not set |
38 | CONFIG_NETFILTER=y | 34 | CONFIG_NETFILTER=y |
39 | CONFIG_IP_NF_QUEUE=m | ||
40 | CONFIG_LLC2=m | 35 | CONFIG_LLC2=m |
41 | CONFIG_NET_PKTGEN=m | 36 | CONFIG_NET_PKTGEN=m |
42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 37 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
@@ -65,21 +60,20 @@ CONFIG_MD_LINEAR=m | |||
65 | CONFIG_MD_RAID0=m | 60 | CONFIG_MD_RAID0=m |
66 | CONFIG_MD_RAID1=m | 61 | CONFIG_MD_RAID1=m |
67 | CONFIG_NETDEVICES=y | 62 | CONFIG_NETDEVICES=y |
68 | CONFIG_DUMMY=m | ||
69 | CONFIG_BONDING=m | 63 | CONFIG_BONDING=m |
64 | CONFIG_DUMMY=m | ||
70 | CONFIG_TUN=m | 65 | CONFIG_TUN=m |
71 | CONFIG_NET_ETHERNET=y | ||
72 | CONFIG_MII=m | ||
73 | CONFIG_LASI_82596=y | 66 | CONFIG_LASI_82596=y |
74 | CONFIG_PPP=m | 67 | CONFIG_PPP=m |
75 | CONFIG_PPP_ASYNC=m | ||
76 | CONFIG_PPP_SYNC_TTY=m | ||
77 | CONFIG_PPP_DEFLATE=m | ||
78 | CONFIG_PPP_BSDCOMP=m | 68 | CONFIG_PPP_BSDCOMP=m |
69 | CONFIG_PPP_DEFLATE=m | ||
79 | CONFIG_PPP_MPPE=m | 70 | CONFIG_PPP_MPPE=m |
80 | CONFIG_PPPOE=m | 71 | CONFIG_PPPOE=m |
72 | CONFIG_PPP_ASYNC=m | ||
73 | CONFIG_PPP_SYNC_TTY=m | ||
81 | # CONFIG_KEYBOARD_HIL_OLD is not set | 74 | # CONFIG_KEYBOARD_HIL_OLD is not set |
82 | CONFIG_MOUSE_SERIAL=m | 75 | CONFIG_MOUSE_SERIAL=m |
76 | CONFIG_LEGACY_PTY_COUNT=64 | ||
83 | CONFIG_SERIAL_8250=y | 77 | CONFIG_SERIAL_8250=y |
84 | CONFIG_SERIAL_8250_CONSOLE=y | 78 | CONFIG_SERIAL_8250_CONSOLE=y |
85 | CONFIG_SERIAL_8250_NR_UARTS=17 | 79 | CONFIG_SERIAL_8250_NR_UARTS=17 |
@@ -88,22 +82,17 @@ CONFIG_SERIAL_8250_MANY_PORTS=y | |||
88 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 82 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
89 | # CONFIG_SERIAL_MUX is not set | 83 | # CONFIG_SERIAL_MUX is not set |
90 | CONFIG_PDC_CONSOLE=y | 84 | CONFIG_PDC_CONSOLE=y |
91 | CONFIG_LEGACY_PTY_COUNT=64 | ||
92 | CONFIG_PRINTER=m | 85 | CONFIG_PRINTER=m |
93 | CONFIG_PPDEV=m | 86 | CONFIG_PPDEV=m |
94 | # CONFIG_HW_RANDOM is not set | 87 | # CONFIG_HW_RANDOM is not set |
95 | CONFIG_RAW_DRIVER=y | 88 | CONFIG_RAW_DRIVER=y |
96 | # CONFIG_HWMON is not set | 89 | # CONFIG_HWMON is not set |
97 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
98 | CONFIG_FB=y | 90 | CONFIG_FB=y |
99 | CONFIG_FB_MODE_HELPERS=y | 91 | CONFIG_FB_MODE_HELPERS=y |
100 | CONFIG_FB_TILEBLITTING=y | 92 | CONFIG_FB_TILEBLITTING=y |
101 | CONFIG_DUMMY_CONSOLE_COLUMNS=128 | 93 | CONFIG_DUMMY_CONSOLE_COLUMNS=128 |
102 | CONFIG_DUMMY_CONSOLE_ROWS=48 | 94 | CONFIG_DUMMY_CONSOLE_ROWS=48 |
103 | CONFIG_FRAMEBUFFER_CONSOLE=y | 95 | CONFIG_FRAMEBUFFER_CONSOLE=y |
104 | CONFIG_FONTS=y | ||
105 | CONFIG_FONT_8x8=y | ||
106 | CONFIG_FONT_8x16=y | ||
107 | CONFIG_LOGO=y | 96 | CONFIG_LOGO=y |
108 | # CONFIG_LOGO_LINUX_MONO is not set | 97 | # CONFIG_LOGO_LINUX_MONO is not set |
109 | # CONFIG_LOGO_LINUX_VGA16 is not set | 98 | # CONFIG_LOGO_LINUX_VGA16 is not set |
@@ -111,13 +100,9 @@ CONFIG_LOGO=y | |||
111 | CONFIG_SOUND=y | 100 | CONFIG_SOUND=y |
112 | CONFIG_SND=y | 101 | CONFIG_SND=y |
113 | CONFIG_SND_SEQUENCER=y | 102 | CONFIG_SND_SEQUENCER=y |
114 | CONFIG_SND_MIXER_OSS=y | ||
115 | CONFIG_SND_PCM_OSS=y | ||
116 | CONFIG_SND_SEQUENCER_OSS=y | ||
117 | CONFIG_SND_HARMONY=y | 103 | CONFIG_SND_HARMONY=y |
118 | CONFIG_EXT2_FS=y | 104 | CONFIG_EXT2_FS=y |
119 | CONFIG_EXT3_FS=y | 105 | CONFIG_EXT3_FS=y |
120 | # CONFIG_EXT3_FS_XATTR is not set | ||
121 | CONFIG_JFS_FS=m | 106 | CONFIG_JFS_FS=m |
122 | CONFIG_XFS_FS=m | 107 | CONFIG_XFS_FS=m |
123 | CONFIG_AUTOFS4_FS=y | 108 | CONFIG_AUTOFS4_FS=y |
@@ -130,14 +115,10 @@ CONFIG_PROC_KCORE=y | |||
130 | CONFIG_TMPFS=y | 115 | CONFIG_TMPFS=y |
131 | CONFIG_UFS_FS=m | 116 | CONFIG_UFS_FS=m |
132 | CONFIG_NFS_FS=y | 117 | CONFIG_NFS_FS=y |
133 | CONFIG_NFS_V3=y | ||
134 | CONFIG_NFS_V4=y | 118 | CONFIG_NFS_V4=y |
135 | CONFIG_ROOT_NFS=y | 119 | CONFIG_ROOT_NFS=y |
136 | CONFIG_NFSD=m | 120 | CONFIG_NFSD=m |
137 | CONFIG_NFSD_V4=y | 121 | CONFIG_NFSD_V4=y |
138 | CONFIG_RPCSEC_GSS_SPKM3=m | ||
139 | CONFIG_SMB_FS=m | ||
140 | CONFIG_SMB_NLS_DEFAULT=y | ||
141 | CONFIG_CIFS=m | 122 | CONFIG_CIFS=m |
142 | CONFIG_NLS_CODEPAGE_437=m | 123 | CONFIG_NLS_CODEPAGE_437=m |
143 | CONFIG_NLS_CODEPAGE_737=m | 124 | CONFIG_NLS_CODEPAGE_737=m |
@@ -177,21 +158,16 @@ CONFIG_NLS_ISO8859_15=m | |||
177 | CONFIG_NLS_KOI8_R=m | 158 | CONFIG_NLS_KOI8_R=m |
178 | CONFIG_NLS_KOI8_U=m | 159 | CONFIG_NLS_KOI8_U=m |
179 | CONFIG_NLS_UTF8=m | 160 | CONFIG_NLS_UTF8=m |
180 | CONFIG_MAGIC_SYSRQ=y | ||
181 | CONFIG_DEBUG_FS=y | 161 | CONFIG_DEBUG_FS=y |
162 | CONFIG_MAGIC_SYSRQ=y | ||
182 | CONFIG_DEBUG_KERNEL=y | 163 | CONFIG_DEBUG_KERNEL=y |
183 | CONFIG_DEBUG_MUTEXES=y | 164 | CONFIG_DEBUG_MUTEXES=y |
184 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
185 | CONFIG_CRYPTO_NULL=m | ||
186 | CONFIG_CRYPTO_TEST=m | 165 | CONFIG_CRYPTO_TEST=m |
187 | CONFIG_CRYPTO_HMAC=y | 166 | CONFIG_CRYPTO_HMAC=y |
188 | CONFIG_CRYPTO_MD4=m | ||
189 | CONFIG_CRYPTO_MICHAEL_MIC=m | 167 | CONFIG_CRYPTO_MICHAEL_MIC=m |
190 | CONFIG_CRYPTO_SHA256=m | ||
191 | CONFIG_CRYPTO_SHA512=m | 168 | CONFIG_CRYPTO_SHA512=m |
192 | CONFIG_CRYPTO_TGR192=m | 169 | CONFIG_CRYPTO_TGR192=m |
193 | CONFIG_CRYPTO_WP512=m | 170 | CONFIG_CRYPTO_WP512=m |
194 | CONFIG_CRYPTO_AES=m | ||
195 | CONFIG_CRYPTO_ANUBIS=m | 171 | CONFIG_CRYPTO_ANUBIS=m |
196 | CONFIG_CRYPTO_BLOWFISH=m | 172 | CONFIG_CRYPTO_BLOWFISH=m |
197 | CONFIG_CRYPTO_CAST6=m | 173 | CONFIG_CRYPTO_CAST6=m |
@@ -200,6 +176,7 @@ CONFIG_CRYPTO_SERPENT=m | |||
200 | CONFIG_CRYPTO_TEA=m | 176 | CONFIG_CRYPTO_TEA=m |
201 | CONFIG_CRYPTO_TWOFISH=m | 177 | CONFIG_CRYPTO_TWOFISH=m |
202 | CONFIG_CRYPTO_DEFLATE=m | 178 | CONFIG_CRYPTO_DEFLATE=m |
203 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
204 | # CONFIG_CRYPTO_HW is not set | 179 | # CONFIG_CRYPTO_HW is not set |
205 | CONFIG_LIBCRC32C=m | 180 | CONFIG_FONTS=y |
181 | CONFIG_FONT_8x8=y | ||
182 | CONFIG_FONT_8x16=y | ||
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig index 1a4f776b49b8..5acb93dcaabf 100644 --- a/arch/parisc/configs/a500_defconfig +++ b/arch/parisc/configs/a500_defconfig | |||
@@ -1,13 +1,10 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | # CONFIG_LOCALVERSION_AUTO is not set | 1 | # CONFIG_LOCALVERSION_AUTO is not set |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
5 | CONFIG_IKCONFIG=y | 4 | CONFIG_IKCONFIG=y |
6 | CONFIG_IKCONFIG_PROC=y | 5 | CONFIG_IKCONFIG_PROC=y |
7 | CONFIG_LOG_BUF_SHIFT=16 | 6 | CONFIG_LOG_BUF_SHIFT=16 |
8 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
9 | CONFIG_BLK_DEV_INITRD=y | 7 | CONFIG_BLK_DEV_INITRD=y |
10 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
11 | CONFIG_EXPERT=y | 8 | CONFIG_EXPERT=y |
12 | CONFIG_KALLSYMS_ALL=y | 9 | CONFIG_KALLSYMS_ALL=y |
13 | CONFIG_SLAB=y | 10 | CONFIG_SLAB=y |
@@ -16,7 +13,6 @@ CONFIG_OPROFILE=m | |||
16 | CONFIG_MODULES=y | 13 | CONFIG_MODULES=y |
17 | CONFIG_MODULE_UNLOAD=y | 14 | CONFIG_MODULE_UNLOAD=y |
18 | CONFIG_MODULE_FORCE_UNLOAD=y | 15 | CONFIG_MODULE_FORCE_UNLOAD=y |
19 | # CONFIG_BLK_DEV_BSG is not set | ||
20 | CONFIG_PA8X00=y | 16 | CONFIG_PA8X00=y |
21 | CONFIG_64BIT=y | 17 | CONFIG_64BIT=y |
22 | CONFIG_SMP=y | 18 | CONFIG_SMP=y |
@@ -43,21 +39,17 @@ CONFIG_IP_PNP_DHCP=y | |||
43 | CONFIG_IP_PNP_BOOTP=y | 39 | CONFIG_IP_PNP_BOOTP=y |
44 | CONFIG_INET_AH=m | 40 | CONFIG_INET_AH=m |
45 | CONFIG_INET_ESP=m | 41 | CONFIG_INET_ESP=m |
46 | # CONFIG_INET_LRO is not set | ||
47 | CONFIG_INET6_AH=m | 42 | CONFIG_INET6_AH=m |
48 | CONFIG_INET6_ESP=m | 43 | CONFIG_INET6_ESP=m |
49 | CONFIG_INET6_IPCOMP=m | 44 | CONFIG_INET6_IPCOMP=m |
50 | CONFIG_IPV6_TUNNEL=m | 45 | CONFIG_IPV6_TUNNEL=m |
51 | CONFIG_NETFILTER=y | 46 | CONFIG_NETFILTER=y |
52 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 47 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
53 | CONFIG_IP_NF_QUEUE=m | ||
54 | CONFIG_IP_NF_IPTABLES=m | 48 | CONFIG_IP_NF_IPTABLES=m |
55 | CONFIG_IP_NF_MATCH_ECN=m | 49 | CONFIG_IP_NF_MATCH_ECN=m |
56 | CONFIG_IP_NF_MATCH_TTL=m | 50 | CONFIG_IP_NF_MATCH_TTL=m |
57 | CONFIG_IP_NF_FILTER=m | 51 | CONFIG_IP_NF_FILTER=m |
58 | CONFIG_IP_NF_TARGET_REJECT=m | 52 | CONFIG_IP_NF_TARGET_REJECT=m |
59 | CONFIG_IP_NF_TARGET_LOG=m | ||
60 | CONFIG_IP_NF_TARGET_ULOG=m | ||
61 | CONFIG_IP_NF_MANGLE=m | 53 | CONFIG_IP_NF_MANGLE=m |
62 | CONFIG_IP_NF_TARGET_ECN=m | 54 | CONFIG_IP_NF_TARGET_ECN=m |
63 | CONFIG_IP_NF_RAW=m | 55 | CONFIG_IP_NF_RAW=m |
@@ -70,7 +62,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
70 | CONFIG_IP6_NF_MATCH_HL=m | 62 | CONFIG_IP6_NF_MATCH_HL=m |
71 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 63 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
72 | CONFIG_IP6_NF_MATCH_RT=m | 64 | CONFIG_IP6_NF_MATCH_RT=m |
73 | CONFIG_IP6_NF_TARGET_LOG=m | ||
74 | CONFIG_IP6_NF_FILTER=m | 65 | CONFIG_IP6_NF_FILTER=m |
75 | CONFIG_IP6_NF_TARGET_REJECT=m | 66 | CONFIG_IP6_NF_TARGET_REJECT=m |
76 | CONFIG_IP6_NF_MANGLE=m | 67 | CONFIG_IP6_NF_MANGLE=m |
@@ -94,7 +85,6 @@ CONFIG_BLK_DEV_SD=y | |||
94 | CONFIG_CHR_DEV_ST=y | 85 | CONFIG_CHR_DEV_ST=y |
95 | CONFIG_BLK_DEV_SR=y | 86 | CONFIG_BLK_DEV_SR=y |
96 | CONFIG_CHR_DEV_SG=y | 87 | CONFIG_CHR_DEV_SG=y |
97 | CONFIG_SCSI_MULTI_LUN=y | ||
98 | CONFIG_SCSI_ISCSI_ATTRS=m | 88 | CONFIG_SCSI_ISCSI_ATTRS=m |
99 | CONFIG_SCSI_SYM53C8XX_2=y | 89 | CONFIG_SCSI_SYM53C8XX_2=y |
100 | CONFIG_SCSI_QLOGIC_1280=m | 90 | CONFIG_SCSI_QLOGIC_1280=m |
@@ -106,43 +96,38 @@ CONFIG_MD_RAID0=y | |||
106 | CONFIG_MD_RAID1=y | 96 | CONFIG_MD_RAID1=y |
107 | CONFIG_FUSION=y | 97 | CONFIG_FUSION=y |
108 | CONFIG_FUSION_SPI=m | 98 | CONFIG_FUSION_SPI=m |
109 | CONFIG_FUSION_FC=m | ||
110 | CONFIG_FUSION_CTL=m | 99 | CONFIG_FUSION_CTL=m |
111 | CONFIG_NETDEVICES=y | 100 | CONFIG_NETDEVICES=y |
112 | CONFIG_DUMMY=m | ||
113 | CONFIG_BONDING=m | 101 | CONFIG_BONDING=m |
102 | CONFIG_DUMMY=m | ||
114 | CONFIG_TUN=m | 103 | CONFIG_TUN=m |
115 | CONFIG_NET_ETHERNET=y | 104 | CONFIG_PCMCIA_3C574=m |
116 | CONFIG_NET_VENDOR_3COM=y | 105 | CONFIG_PCMCIA_3C589=m |
117 | CONFIG_VORTEX=m | 106 | CONFIG_VORTEX=m |
118 | CONFIG_TYPHOON=m | 107 | CONFIG_TYPHOON=m |
108 | CONFIG_ACENIC=m | ||
109 | CONFIG_ACENIC_OMIT_TIGON_I=y | ||
110 | CONFIG_PCNET32=m | ||
111 | CONFIG_TIGON3=m | ||
119 | CONFIG_NET_TULIP=y | 112 | CONFIG_NET_TULIP=y |
120 | CONFIG_DE2104X=m | 113 | CONFIG_DE2104X=m |
121 | CONFIG_TULIP=y | 114 | CONFIG_TULIP=y |
122 | CONFIG_TULIP_MMIO=y | 115 | CONFIG_TULIP_MMIO=y |
123 | CONFIG_PCMCIA_XIRCOM=m | 116 | CONFIG_PCMCIA_XIRCOM=m |
124 | CONFIG_HP100=m | 117 | CONFIG_HP100=m |
125 | CONFIG_NET_PCI=y | ||
126 | CONFIG_PCNET32=m | ||
127 | CONFIG_E100=m | 118 | CONFIG_E100=m |
128 | CONFIG_ACENIC=m | ||
129 | CONFIG_ACENIC_OMIT_TIGON_I=y | ||
130 | CONFIG_E1000=m | 119 | CONFIG_E1000=m |
131 | CONFIG_TIGON3=m | ||
132 | CONFIG_NET_PCMCIA=y | ||
133 | CONFIG_PCMCIA_3C589=m | ||
134 | CONFIG_PCMCIA_3C574=m | ||
135 | CONFIG_PCMCIA_SMC91C92=m | 120 | CONFIG_PCMCIA_SMC91C92=m |
136 | CONFIG_PCMCIA_XIRC2PS=m | 121 | CONFIG_PCMCIA_XIRC2PS=m |
137 | CONFIG_PPP=m | 122 | CONFIG_PPP=m |
123 | CONFIG_PPP_BSDCOMP=m | ||
124 | CONFIG_PPP_DEFLATE=m | ||
138 | CONFIG_PPP_ASYNC=m | 125 | CONFIG_PPP_ASYNC=m |
139 | CONFIG_PPP_SYNC_TTY=m | 126 | CONFIG_PPP_SYNC_TTY=m |
140 | CONFIG_PPP_DEFLATE=m | ||
141 | CONFIG_PPP_BSDCOMP=m | ||
142 | # CONFIG_INPUT_MOUSEDEV is not set | ||
143 | # CONFIG_INPUT_KEYBOARD is not set | 127 | # CONFIG_INPUT_KEYBOARD is not set |
144 | # CONFIG_INPUT_MOUSE is not set | 128 | # CONFIG_INPUT_MOUSE is not set |
145 | # CONFIG_SERIO is not set | 129 | # CONFIG_SERIO is not set |
130 | # CONFIG_LEGACY_PTYS is not set | ||
146 | CONFIG_SERIAL_8250=y | 131 | CONFIG_SERIAL_8250=y |
147 | CONFIG_SERIAL_8250_CONSOLE=y | 132 | CONFIG_SERIAL_8250_CONSOLE=y |
148 | CONFIG_SERIAL_8250_CS=m | 133 | CONFIG_SERIAL_8250_CS=m |
@@ -151,7 +136,6 @@ CONFIG_SERIAL_8250_EXTENDED=y | |||
151 | CONFIG_SERIAL_8250_MANY_PORTS=y | 136 | CONFIG_SERIAL_8250_MANY_PORTS=y |
152 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 137 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
153 | CONFIG_PDC_CONSOLE=y | 138 | CONFIG_PDC_CONSOLE=y |
154 | # CONFIG_LEGACY_PTYS is not set | ||
155 | # CONFIG_HW_RANDOM is not set | 139 | # CONFIG_HW_RANDOM is not set |
156 | CONFIG_RAW_DRIVER=y | 140 | CONFIG_RAW_DRIVER=y |
157 | # CONFIG_HWMON is not set | 141 | # CONFIG_HWMON is not set |
@@ -160,7 +144,6 @@ CONFIG_AGP_PARISC=y | |||
160 | # CONFIG_STI_CONSOLE is not set | 144 | # CONFIG_STI_CONSOLE is not set |
161 | CONFIG_EXT2_FS=y | 145 | CONFIG_EXT2_FS=y |
162 | CONFIG_EXT3_FS=y | 146 | CONFIG_EXT3_FS=y |
163 | # CONFIG_EXT3_FS_XATTR is not set | ||
164 | CONFIG_JFS_FS=m | 147 | CONFIG_JFS_FS=m |
165 | CONFIG_XFS_FS=m | 148 | CONFIG_XFS_FS=m |
166 | CONFIG_AUTOFS4_FS=y | 149 | CONFIG_AUTOFS4_FS=y |
@@ -173,13 +156,9 @@ CONFIG_PROC_KCORE=y | |||
173 | CONFIG_TMPFS=y | 156 | CONFIG_TMPFS=y |
174 | CONFIG_UFS_FS=m | 157 | CONFIG_UFS_FS=m |
175 | CONFIG_NFS_FS=m | 158 | CONFIG_NFS_FS=m |
176 | CONFIG_NFS_V3=y | 159 | CONFIG_NFS_V4=m |
177 | CONFIG_NFS_V4=y | ||
178 | CONFIG_NFSD=m | 160 | CONFIG_NFSD=m |
179 | CONFIG_NFSD_V4=y | 161 | CONFIG_NFSD_V4=y |
180 | CONFIG_RPCSEC_GSS_SPKM3=m | ||
181 | CONFIG_SMB_FS=m | ||
182 | CONFIG_SMB_NLS_DEFAULT=y | ||
183 | CONFIG_CIFS=m | 162 | CONFIG_CIFS=m |
184 | CONFIG_NLS_CODEPAGE_437=m | 163 | CONFIG_NLS_CODEPAGE_437=m |
185 | CONFIG_NLS_CODEPAGE_850=m | 164 | CONFIG_NLS_CODEPAGE_850=m |
@@ -187,17 +166,12 @@ CONFIG_NLS_ASCII=m | |||
187 | CONFIG_NLS_ISO8859_1=m | 166 | CONFIG_NLS_ISO8859_1=m |
188 | CONFIG_NLS_ISO8859_15=m | 167 | CONFIG_NLS_ISO8859_15=m |
189 | CONFIG_NLS_UTF8=m | 168 | CONFIG_NLS_UTF8=m |
190 | CONFIG_MAGIC_SYSRQ=y | ||
191 | CONFIG_DEBUG_FS=y | 169 | CONFIG_DEBUG_FS=y |
192 | CONFIG_HEADERS_CHECK=y | 170 | CONFIG_HEADERS_CHECK=y |
193 | CONFIG_DEBUG_KERNEL=y | 171 | CONFIG_MAGIC_SYSRQ=y |
194 | # CONFIG_DEBUG_BUGVERBOSE is not set | 172 | # CONFIG_DEBUG_BUGVERBOSE is not set |
195 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
196 | CONFIG_CRYPTO_NULL=m | ||
197 | CONFIG_CRYPTO_TEST=m | 173 | CONFIG_CRYPTO_TEST=m |
198 | CONFIG_CRYPTO_HMAC=y | 174 | CONFIG_CRYPTO_HMAC=y |
199 | CONFIG_CRYPTO_MD5=y | 175 | CONFIG_CRYPTO_MD5=y |
200 | CONFIG_CRYPTO_BLOWFISH=m | 176 | CONFIG_CRYPTO_BLOWFISH=m |
201 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
202 | # CONFIG_CRYPTO_HW is not set | 177 | # CONFIG_CRYPTO_HW is not set |
203 | CONFIG_LIBCRC32C=m | ||
diff --git a/arch/parisc/configs/b180_defconfig b/arch/parisc/configs/b180_defconfig index f1a0c25bef8d..83ffd161aec5 100644 --- a/arch/parisc/configs/b180_defconfig +++ b/arch/parisc/configs/b180_defconfig | |||
@@ -3,7 +3,6 @@ CONFIG_SYSVIPC=y | |||
3 | CONFIG_IKCONFIG=y | 3 | CONFIG_IKCONFIG=y |
4 | CONFIG_IKCONFIG_PROC=y | 4 | CONFIG_IKCONFIG_PROC=y |
5 | CONFIG_LOG_BUF_SHIFT=16 | 5 | CONFIG_LOG_BUF_SHIFT=16 |
6 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
7 | CONFIG_BLK_DEV_INITRD=y | 6 | CONFIG_BLK_DEV_INITRD=y |
8 | CONFIG_SLAB=y | 7 | CONFIG_SLAB=y |
9 | CONFIG_MODULES=y | 8 | CONFIG_MODULES=y |
@@ -25,8 +24,6 @@ CONFIG_INET=y | |||
25 | CONFIG_IP_MULTICAST=y | 24 | CONFIG_IP_MULTICAST=y |
26 | CONFIG_IP_PNP=y | 25 | CONFIG_IP_PNP=y |
27 | CONFIG_IP_PNP_BOOTP=y | 26 | CONFIG_IP_PNP_BOOTP=y |
28 | # CONFIG_INET_LRO is not set | ||
29 | CONFIG_IPV6=y | ||
30 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 27 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
31 | CONFIG_DEVTMPFS=y | 28 | CONFIG_DEVTMPFS=y |
32 | CONFIG_DEVTMPFS_MOUNT=y | 29 | CONFIG_DEVTMPFS_MOUNT=y |
@@ -53,10 +50,9 @@ CONFIG_MD_LINEAR=y | |||
53 | CONFIG_MD_RAID0=y | 50 | CONFIG_MD_RAID0=y |
54 | CONFIG_MD_RAID1=y | 51 | CONFIG_MD_RAID1=y |
55 | CONFIG_NETDEVICES=y | 52 | CONFIG_NETDEVICES=y |
56 | CONFIG_NET_ETHERNET=y | ||
57 | CONFIG_LASI_82596=y | ||
58 | CONFIG_NET_TULIP=y | 53 | CONFIG_NET_TULIP=y |
59 | CONFIG_TULIP=y | 54 | CONFIG_TULIP=y |
55 | CONFIG_LASI_82596=y | ||
60 | CONFIG_PPP=y | 56 | CONFIG_PPP=y |
61 | CONFIG_INPUT_EVDEV=y | 57 | CONFIG_INPUT_EVDEV=y |
62 | # CONFIG_KEYBOARD_HIL_OLD is not set | 58 | # CONFIG_KEYBOARD_HIL_OLD is not set |
@@ -71,40 +67,31 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
71 | CONFIG_PRINTER=y | 67 | CONFIG_PRINTER=y |
72 | # CONFIG_HW_RANDOM is not set | 68 | # CONFIG_HW_RANDOM is not set |
73 | # CONFIG_HWMON is not set | 69 | # CONFIG_HWMON is not set |
74 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
75 | CONFIG_FB=y | 70 | CONFIG_FB=y |
76 | CONFIG_FRAMEBUFFER_CONSOLE=y | 71 | CONFIG_FRAMEBUFFER_CONSOLE=y |
77 | CONFIG_LOGO=y | 72 | CONFIG_LOGO=y |
78 | CONFIG_SOUND=y | 73 | CONFIG_SOUND=y |
79 | CONFIG_SND=y | 74 | CONFIG_SND=y |
80 | CONFIG_SND_SEQUENCER=y | 75 | CONFIG_SND_SEQUENCER=y |
81 | CONFIG_SND_MIXER_OSS=y | ||
82 | CONFIG_SND_PCM_OSS=y | ||
83 | CONFIG_SND_SEQUENCER_OSS=y | ||
84 | CONFIG_SND_HARMONY=y | 76 | CONFIG_SND_HARMONY=y |
85 | CONFIG_EXT2_FS=y | 77 | CONFIG_EXT2_FS=y |
86 | CONFIG_EXT3_FS=y | 78 | CONFIG_EXT3_FS=y |
87 | # CONFIG_EXT3_FS_XATTR is not set | ||
88 | CONFIG_AUTOFS4_FS=y | 79 | CONFIG_AUTOFS4_FS=y |
89 | CONFIG_ISO9660_FS=y | 80 | CONFIG_ISO9660_FS=y |
90 | CONFIG_JOLIET=y | 81 | CONFIG_JOLIET=y |
91 | CONFIG_PROC_KCORE=y | 82 | CONFIG_PROC_KCORE=y |
92 | CONFIG_TMPFS=y | 83 | CONFIG_TMPFS=y |
93 | CONFIG_NFS_FS=y | 84 | CONFIG_NFS_FS=y |
94 | CONFIG_NFS_V3=y | ||
95 | CONFIG_ROOT_NFS=y | 85 | CONFIG_ROOT_NFS=y |
96 | CONFIG_NFSD=y | 86 | CONFIG_NFSD=y |
97 | CONFIG_NFSD_V3=y | 87 | CONFIG_NFSD_V3=y |
98 | CONFIG_SMB_FS=y | ||
99 | CONFIG_NLS_CODEPAGE_437=m | 88 | CONFIG_NLS_CODEPAGE_437=m |
100 | CONFIG_NLS_CODEPAGE_850=m | 89 | CONFIG_NLS_CODEPAGE_850=m |
101 | CONFIG_NLS_ASCII=m | 90 | CONFIG_NLS_ASCII=m |
102 | CONFIG_NLS_ISO8859_1=m | 91 | CONFIG_NLS_ISO8859_1=m |
103 | CONFIG_NLS_ISO8859_15=m | 92 | CONFIG_NLS_ISO8859_15=m |
104 | CONFIG_NLS_UTF8=m | 93 | CONFIG_NLS_UTF8=m |
105 | CONFIG_MAGIC_SYSRQ=y | ||
106 | CONFIG_HEADERS_CHECK=y | 94 | CONFIG_HEADERS_CHECK=y |
95 | CONFIG_MAGIC_SYSRQ=y | ||
107 | CONFIG_DEBUG_KERNEL=y | 96 | CONFIG_DEBUG_KERNEL=y |
108 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
109 | CONFIG_SECURITY=y | 97 | CONFIG_SECURITY=y |
110 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index 8e8f0e34f817..0764d3971cf6 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig | |||
@@ -1,12 +1,9 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | # CONFIG_LOCALVERSION_AUTO is not set | 1 | # CONFIG_LOCALVERSION_AUTO is not set |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_IKCONFIG=y | 3 | CONFIG_IKCONFIG=y |
5 | CONFIG_IKCONFIG_PROC=y | 4 | CONFIG_IKCONFIG_PROC=y |
6 | CONFIG_LOG_BUF_SHIFT=16 | 5 | CONFIG_LOG_BUF_SHIFT=16 |
7 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
8 | CONFIG_BLK_DEV_INITRD=y | 6 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_EXPERT=y | 7 | CONFIG_EXPERT=y |
11 | CONFIG_KALLSYMS_ALL=y | 8 | CONFIG_KALLSYMS_ALL=y |
12 | CONFIG_SLAB=y | 9 | CONFIG_SLAB=y |
@@ -15,7 +12,6 @@ CONFIG_OPROFILE=m | |||
15 | CONFIG_MODULES=y | 12 | CONFIG_MODULES=y |
16 | CONFIG_MODULE_UNLOAD=y | 13 | CONFIG_MODULE_UNLOAD=y |
17 | CONFIG_MODULE_FORCE_UNLOAD=y | 14 | CONFIG_MODULE_FORCE_UNLOAD=y |
18 | # CONFIG_BLK_DEV_BSG is not set | ||
19 | CONFIG_PA8X00=y | 15 | CONFIG_PA8X00=y |
20 | CONFIG_PREEMPT_VOLUNTARY=y | 16 | CONFIG_PREEMPT_VOLUNTARY=y |
21 | # CONFIG_GSC is not set | 17 | # CONFIG_GSC is not set |
@@ -31,13 +27,11 @@ CONFIG_INET=y | |||
31 | CONFIG_IP_MULTICAST=y | 27 | CONFIG_IP_MULTICAST=y |
32 | CONFIG_IP_PNP=y | 28 | CONFIG_IP_PNP=y |
33 | CONFIG_IP_PNP_BOOTP=y | 29 | CONFIG_IP_PNP_BOOTP=y |
34 | # CONFIG_INET_LRO is not set | ||
35 | # CONFIG_INET_DIAG is not set | 30 | # CONFIG_INET_DIAG is not set |
36 | CONFIG_INET6_IPCOMP=m | 31 | CONFIG_INET6_IPCOMP=m |
37 | CONFIG_IPV6_TUNNEL=m | 32 | CONFIG_IPV6_TUNNEL=m |
38 | CONFIG_NETFILTER=y | 33 | CONFIG_NETFILTER=y |
39 | CONFIG_NETFILTER_DEBUG=y | 34 | CONFIG_NETFILTER_DEBUG=y |
40 | CONFIG_IP_NF_QUEUE=m | ||
41 | CONFIG_NET_PKTGEN=m | 35 | CONFIG_NET_PKTGEN=m |
42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 36 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
43 | CONFIG_DEVTMPFS=y | 37 | CONFIG_DEVTMPFS=y |
@@ -50,13 +44,11 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
50 | CONFIG_IDE=y | 44 | CONFIG_IDE=y |
51 | CONFIG_BLK_DEV_IDECD=y | 45 | CONFIG_BLK_DEV_IDECD=y |
52 | CONFIG_BLK_DEV_NS87415=y | 46 | CONFIG_BLK_DEV_NS87415=y |
53 | CONFIG_PATA_SIL680=m | ||
54 | CONFIG_SCSI=y | 47 | CONFIG_SCSI=y |
55 | CONFIG_BLK_DEV_SD=y | 48 | CONFIG_BLK_DEV_SD=y |
56 | CONFIG_CHR_DEV_ST=y | 49 | CONFIG_CHR_DEV_ST=y |
57 | CONFIG_BLK_DEV_SR=y | 50 | CONFIG_BLK_DEV_SR=y |
58 | CONFIG_CHR_DEV_SG=y | 51 | CONFIG_CHR_DEV_SG=y |
59 | CONFIG_SCSI_MULTI_LUN=y | ||
60 | CONFIG_SCSI_ISCSI_ATTRS=m | 52 | CONFIG_SCSI_ISCSI_ATTRS=m |
61 | CONFIG_SCSI_SYM53C8XX_2=y | 53 | CONFIG_SCSI_SYM53C8XX_2=y |
62 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 | 54 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 |
@@ -76,28 +68,23 @@ CONFIG_FUSION=y | |||
76 | CONFIG_FUSION_SPI=m | 68 | CONFIG_FUSION_SPI=m |
77 | CONFIG_FUSION_CTL=m | 69 | CONFIG_FUSION_CTL=m |
78 | CONFIG_NETDEVICES=y | 70 | CONFIG_NETDEVICES=y |
79 | CONFIG_DUMMY=m | ||
80 | CONFIG_BONDING=m | 71 | CONFIG_BONDING=m |
72 | CONFIG_DUMMY=m | ||
81 | CONFIG_TUN=m | 73 | CONFIG_TUN=m |
82 | CONFIG_NET_ETHERNET=y | 74 | CONFIG_ACENIC=m |
75 | CONFIG_TIGON3=m | ||
83 | CONFIG_NET_TULIP=y | 76 | CONFIG_NET_TULIP=y |
84 | CONFIG_DE2104X=m | 77 | CONFIG_DE2104X=m |
85 | CONFIG_TULIP=y | 78 | CONFIG_TULIP=y |
86 | CONFIG_TULIP_MMIO=y | 79 | CONFIG_TULIP_MMIO=y |
87 | CONFIG_NET_PCI=y | ||
88 | CONFIG_E100=m | 80 | CONFIG_E100=m |
89 | CONFIG_ACENIC=m | ||
90 | CONFIG_E1000=m | 81 | CONFIG_E1000=m |
91 | CONFIG_TIGON3=m | ||
92 | CONFIG_PPP=m | 82 | CONFIG_PPP=m |
93 | CONFIG_PPP_ASYNC=m | ||
94 | CONFIG_PPP_SYNC_TTY=m | ||
95 | CONFIG_PPP_DEFLATE=m | ||
96 | CONFIG_PPP_BSDCOMP=m | 83 | CONFIG_PPP_BSDCOMP=m |
84 | CONFIG_PPP_DEFLATE=m | ||
97 | CONFIG_PPPOE=m | 85 | CONFIG_PPPOE=m |
98 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 86 | CONFIG_PPP_ASYNC=m |
99 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600 | 87 | CONFIG_PPP_SYNC_TTY=m |
100 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200 | ||
101 | # CONFIG_KEYBOARD_ATKBD is not set | 88 | # CONFIG_KEYBOARD_ATKBD is not set |
102 | # CONFIG_MOUSE_PS2 is not set | 89 | # CONFIG_MOUSE_PS2 is not set |
103 | CONFIG_SERIO=m | 90 | CONFIG_SERIO=m |
@@ -111,7 +98,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
111 | # CONFIG_HW_RANDOM is not set | 98 | # CONFIG_HW_RANDOM is not set |
112 | CONFIG_RAW_DRIVER=y | 99 | CONFIG_RAW_DRIVER=y |
113 | # CONFIG_HWMON is not set | 100 | # CONFIG_HWMON is not set |
114 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
115 | CONFIG_FB=y | 101 | CONFIG_FB=y |
116 | CONFIG_FRAMEBUFFER_CONSOLE=y | 102 | CONFIG_FRAMEBUFFER_CONSOLE=y |
117 | CONFIG_LOGO=y | 103 | CONFIG_LOGO=y |
@@ -121,9 +107,6 @@ CONFIG_LOGO=y | |||
121 | CONFIG_SOUND=y | 107 | CONFIG_SOUND=y |
122 | CONFIG_SND=y | 108 | CONFIG_SND=y |
123 | CONFIG_SND_SEQUENCER=y | 109 | CONFIG_SND_SEQUENCER=y |
124 | CONFIG_SND_MIXER_OSS=y | ||
125 | CONFIG_SND_PCM_OSS=y | ||
126 | CONFIG_SND_SEQUENCER_OSS=y | ||
127 | CONFIG_SND_AD1889=y | 110 | CONFIG_SND_AD1889=y |
128 | CONFIG_USB_HIDDEV=y | 111 | CONFIG_USB_HIDDEV=y |
129 | CONFIG_USB=y | 112 | CONFIG_USB=y |
@@ -139,7 +122,6 @@ CONFIG_USB_MICROTEK=m | |||
139 | CONFIG_USB_LEGOTOWER=m | 122 | CONFIG_USB_LEGOTOWER=m |
140 | CONFIG_EXT2_FS=y | 123 | CONFIG_EXT2_FS=y |
141 | CONFIG_EXT3_FS=y | 124 | CONFIG_EXT3_FS=y |
142 | # CONFIG_EXT3_FS_XATTR is not set | ||
143 | CONFIG_XFS_FS=m | 125 | CONFIG_XFS_FS=m |
144 | CONFIG_AUTOFS4_FS=y | 126 | CONFIG_AUTOFS4_FS=y |
145 | CONFIG_ISO9660_FS=y | 127 | CONFIG_ISO9660_FS=y |
@@ -149,7 +131,6 @@ CONFIG_VFAT_FS=m | |||
149 | CONFIG_PROC_KCORE=y | 131 | CONFIG_PROC_KCORE=y |
150 | CONFIG_TMPFS=y | 132 | CONFIG_TMPFS=y |
151 | CONFIG_NFS_FS=y | 133 | CONFIG_NFS_FS=y |
152 | CONFIG_NFS_V3=y | ||
153 | CONFIG_ROOT_NFS=y | 134 | CONFIG_ROOT_NFS=y |
154 | CONFIG_NFSD=y | 135 | CONFIG_NFSD=y |
155 | CONFIG_NFSD_V3=y | 136 | CONFIG_NFSD_V3=y |
@@ -159,18 +140,13 @@ CONFIG_NLS_ASCII=m | |||
159 | CONFIG_NLS_ISO8859_1=m | 140 | CONFIG_NLS_ISO8859_1=m |
160 | CONFIG_NLS_ISO8859_15=m | 141 | CONFIG_NLS_ISO8859_15=m |
161 | CONFIG_NLS_UTF8=m | 142 | CONFIG_NLS_UTF8=m |
162 | CONFIG_MAGIC_SYSRQ=y | ||
163 | CONFIG_DEBUG_FS=y | 143 | CONFIG_DEBUG_FS=y |
164 | CONFIG_HEADERS_CHECK=y | 144 | CONFIG_HEADERS_CHECK=y |
165 | CONFIG_DEBUG_KERNEL=y | 145 | CONFIG_MAGIC_SYSRQ=y |
166 | CONFIG_DEBUG_MUTEXES=y | 146 | CONFIG_DEBUG_MUTEXES=y |
167 | # CONFIG_DEBUG_BUGVERBOSE is not set | 147 | # CONFIG_DEBUG_BUGVERBOSE is not set |
168 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
169 | CONFIG_CRYPTO_NULL=m | ||
170 | CONFIG_CRYPTO_TEST=m | 148 | CONFIG_CRYPTO_TEST=m |
171 | CONFIG_CRYPTO_MD5=m | 149 | CONFIG_CRYPTO_MD5=m |
172 | CONFIG_CRYPTO_BLOWFISH=m | 150 | CONFIG_CRYPTO_BLOWFISH=m |
173 | CONFIG_CRYPTO_DES=m | 151 | CONFIG_CRYPTO_DES=m |
174 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
175 | # CONFIG_CRYPTO_HW is not set | 152 | # CONFIG_CRYPTO_HW is not set |
176 | CONFIG_LIBCRC32C=m | ||
diff --git a/arch/parisc/configs/c8000_defconfig b/arch/parisc/configs/c8000_defconfig index f6a4c016304b..088ab948a5ca 100644 --- a/arch/parisc/configs/c8000_defconfig +++ b/arch/parisc/configs/c8000_defconfig | |||
@@ -1,16 +1,13 @@ | |||
1 | # CONFIG_LOCALVERSION_AUTO is not set | 1 | # CONFIG_LOCALVERSION_AUTO is not set |
2 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
3 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | 4 | # CONFIG_CROSS_MEMORY_ATTACH is not set |
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_BSD_PROCESS_ACCT_V3=y | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_IKCONFIG=y | 7 | CONFIG_IKCONFIG=y |
8 | CONFIG_IKCONFIG_PROC=y | 8 | CONFIG_IKCONFIG_PROC=y |
9 | CONFIG_RELAY=y | 9 | CONFIG_RELAY=y |
10 | CONFIG_BLK_DEV_INITRD=y | 10 | CONFIG_BLK_DEV_INITRD=y |
11 | CONFIG_RD_BZIP2=y | ||
12 | CONFIG_RD_LZMA=y | ||
13 | CONFIG_RD_LZO=y | ||
14 | CONFIG_EXPERT=y | 11 | CONFIG_EXPERT=y |
15 | CONFIG_SYSCTL_SYSCALL=y | 12 | CONFIG_SYSCTL_SYSCALL=y |
16 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
@@ -23,7 +20,6 @@ CONFIG_PA8X00=y | |||
23 | CONFIG_64BIT=y | 20 | CONFIG_64BIT=y |
24 | CONFIG_SMP=y | 21 | CONFIG_SMP=y |
25 | CONFIG_PREEMPT=y | 22 | CONFIG_PREEMPT=y |
26 | # CONFIG_CROSS_MEMORY_ATTACH is not set | ||
27 | CONFIG_IOMMU_CCIO=y | 23 | CONFIG_IOMMU_CCIO=y |
28 | CONFIG_PCI=y | 24 | CONFIG_PCI=y |
29 | CONFIG_PCI_LBA=y | 25 | CONFIG_PCI_LBA=y |
@@ -146,7 +142,6 @@ CONFIG_FB_FOREIGN_ENDIAN=y | |||
146 | CONFIG_FB_MODE_HELPERS=y | 142 | CONFIG_FB_MODE_HELPERS=y |
147 | CONFIG_FB_TILEBLITTING=y | 143 | CONFIG_FB_TILEBLITTING=y |
148 | # CONFIG_FB_STI is not set | 144 | # CONFIG_FB_STI is not set |
149 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
150 | # CONFIG_LCD_CLASS_DEVICE is not set | 145 | # CONFIG_LCD_CLASS_DEVICE is not set |
151 | # CONFIG_BACKLIGHT_GENERIC is not set | 146 | # CONFIG_BACKLIGHT_GENERIC is not set |
152 | CONFIG_FRAMEBUFFER_CONSOLE=y | 147 | CONFIG_FRAMEBUFFER_CONSOLE=y |
@@ -157,12 +152,9 @@ CONFIG_LOGO=y | |||
157 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 152 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
158 | CONFIG_SOUND=m | 153 | CONFIG_SOUND=m |
159 | CONFIG_SND=m | 154 | CONFIG_SND=m |
155 | CONFIG_SND_VERBOSE_PRINTK=y | ||
160 | CONFIG_SND_SEQUENCER=m | 156 | CONFIG_SND_SEQUENCER=m |
161 | CONFIG_SND_SEQ_DUMMY=m | 157 | CONFIG_SND_SEQ_DUMMY=m |
162 | CONFIG_SND_MIXER_OSS=m | ||
163 | CONFIG_SND_PCM_OSS=m | ||
164 | CONFIG_SND_SEQUENCER_OSS=y | ||
165 | CONFIG_SND_VERBOSE_PRINTK=y | ||
166 | CONFIG_SND_AD1889=m | 158 | CONFIG_SND_AD1889=m |
167 | # CONFIG_SND_USB is not set | 159 | # CONFIG_SND_USB is not set |
168 | # CONFIG_SND_GSC is not set | 160 | # CONFIG_SND_GSC is not set |
@@ -174,8 +166,6 @@ CONFIG_EXT2_FS_XATTR=y | |||
174 | CONFIG_EXT2_FS_POSIX_ACL=y | 166 | CONFIG_EXT2_FS_POSIX_ACL=y |
175 | CONFIG_EXT2_FS_SECURITY=y | 167 | CONFIG_EXT2_FS_SECURITY=y |
176 | CONFIG_EXT3_FS=y | 168 | CONFIG_EXT3_FS=y |
177 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
178 | CONFIG_EXT4_FS=m | ||
179 | CONFIG_REISERFS_FS=m | 169 | CONFIG_REISERFS_FS=m |
180 | CONFIG_REISERFS_PROC_INFO=y | 170 | CONFIG_REISERFS_PROC_INFO=y |
181 | CONFIG_XFS_FS=m | 171 | CONFIG_XFS_FS=m |
@@ -238,11 +228,8 @@ CONFIG_DEBUG_SLAB=y | |||
238 | CONFIG_DEBUG_SLAB_LEAK=y | 228 | CONFIG_DEBUG_SLAB_LEAK=y |
239 | CONFIG_DEBUG_MEMORY_INIT=y | 229 | CONFIG_DEBUG_MEMORY_INIT=y |
240 | CONFIG_DEBUG_STACKOVERFLOW=y | 230 | CONFIG_DEBUG_STACKOVERFLOW=y |
241 | CONFIG_LOCKUP_DETECTOR=y | ||
242 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y | ||
243 | CONFIG_PANIC_ON_OOPS=y | 231 | CONFIG_PANIC_ON_OOPS=y |
244 | CONFIG_DEBUG_RT_MUTEXES=y | 232 | CONFIG_DEBUG_RT_MUTEXES=y |
245 | CONFIG_PROVE_RCU_DELAY=y | ||
246 | CONFIG_DEBUG_BLOCK_EXT_DEVT=y | 233 | CONFIG_DEBUG_BLOCK_EXT_DEVT=y |
247 | CONFIG_LATENCYTOP=y | 234 | CONFIG_LATENCYTOP=y |
248 | CONFIG_KEYS=y | 235 | CONFIG_KEYS=y |
diff --git a/arch/parisc/configs/default_defconfig b/arch/parisc/configs/default_defconfig index 310b6657e4ac..52c9050a7c5c 100644 --- a/arch/parisc/configs/default_defconfig +++ b/arch/parisc/configs/default_defconfig | |||
@@ -1,11 +1,9 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | # CONFIG_LOCALVERSION_AUTO is not set | 1 | # CONFIG_LOCALVERSION_AUTO is not set |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
5 | CONFIG_IKCONFIG=y | 4 | CONFIG_IKCONFIG=y |
6 | CONFIG_IKCONFIG_PROC=y | 5 | CONFIG_IKCONFIG_PROC=y |
7 | CONFIG_LOG_BUF_SHIFT=16 | 6 | CONFIG_LOG_BUF_SHIFT=16 |
8 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
9 | CONFIG_BLK_DEV_INITRD=y | 7 | CONFIG_BLK_DEV_INITRD=y |
10 | CONFIG_KALLSYMS_ALL=y | 8 | CONFIG_KALLSYMS_ALL=y |
11 | CONFIG_SLAB=y | 9 | CONFIG_SLAB=y |
@@ -41,9 +39,7 @@ CONFIG_IP_PNP_DHCP=y | |||
41 | CONFIG_IP_PNP_BOOTP=y | 39 | CONFIG_IP_PNP_BOOTP=y |
42 | CONFIG_INET_AH=m | 40 | CONFIG_INET_AH=m |
43 | CONFIG_INET_ESP=m | 41 | CONFIG_INET_ESP=m |
44 | # CONFIG_INET_LRO is not set | ||
45 | CONFIG_INET_DIAG=m | 42 | CONFIG_INET_DIAG=m |
46 | CONFIG_IPV6=y | ||
47 | CONFIG_INET6_AH=y | 43 | CONFIG_INET6_AH=y |
48 | CONFIG_INET6_ESP=y | 44 | CONFIG_INET6_ESP=y |
49 | CONFIG_INET6_IPCOMP=y | 45 | CONFIG_INET6_IPCOMP=y |
@@ -82,26 +78,23 @@ CONFIG_MD_RAID1=y | |||
82 | CONFIG_MD_RAID10=y | 78 | CONFIG_MD_RAID10=y |
83 | CONFIG_BLK_DEV_DM=y | 79 | CONFIG_BLK_DEV_DM=y |
84 | CONFIG_NETDEVICES=y | 80 | CONFIG_NETDEVICES=y |
85 | CONFIG_DUMMY=m | ||
86 | CONFIG_BONDING=m | 81 | CONFIG_BONDING=m |
82 | CONFIG_DUMMY=m | ||
87 | CONFIG_TUN=m | 83 | CONFIG_TUN=m |
88 | CONFIG_NET_ETHERNET=y | ||
89 | CONFIG_MII=m | ||
90 | CONFIG_LASI_82596=y | ||
91 | CONFIG_NET_TULIP=y | ||
92 | CONFIG_TULIP=y | ||
93 | CONFIG_NET_PCI=y | ||
94 | CONFIG_ACENIC=y | 84 | CONFIG_ACENIC=y |
95 | CONFIG_TIGON3=y | 85 | CONFIG_TIGON3=y |
96 | CONFIG_NET_PCMCIA=y | 86 | CONFIG_NET_TULIP=y |
87 | CONFIG_TULIP=y | ||
88 | CONFIG_LASI_82596=y | ||
97 | CONFIG_PPP=m | 89 | CONFIG_PPP=m |
98 | CONFIG_PPP_ASYNC=m | ||
99 | CONFIG_PPP_SYNC_TTY=m | ||
100 | CONFIG_PPP_DEFLATE=m | ||
101 | CONFIG_PPP_BSDCOMP=m | 90 | CONFIG_PPP_BSDCOMP=m |
91 | CONFIG_PPP_DEFLATE=m | ||
102 | CONFIG_PPPOE=m | 92 | CONFIG_PPPOE=m |
93 | CONFIG_PPP_ASYNC=m | ||
94 | CONFIG_PPP_SYNC_TTY=m | ||
103 | # CONFIG_KEYBOARD_HIL_OLD is not set | 95 | # CONFIG_KEYBOARD_HIL_OLD is not set |
104 | CONFIG_MOUSE_SERIAL=y | 96 | CONFIG_MOUSE_SERIAL=y |
97 | CONFIG_LEGACY_PTY_COUNT=64 | ||
105 | CONFIG_SERIAL_8250=y | 98 | CONFIG_SERIAL_8250=y |
106 | CONFIG_SERIAL_8250_CONSOLE=y | 99 | CONFIG_SERIAL_8250_CONSOLE=y |
107 | CONFIG_SERIAL_8250_CS=y | 100 | CONFIG_SERIAL_8250_CS=y |
@@ -109,31 +102,24 @@ CONFIG_SERIAL_8250_NR_UARTS=17 | |||
109 | CONFIG_SERIAL_8250_EXTENDED=y | 102 | CONFIG_SERIAL_8250_EXTENDED=y |
110 | CONFIG_SERIAL_8250_MANY_PORTS=y | 103 | CONFIG_SERIAL_8250_MANY_PORTS=y |
111 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 104 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
112 | CONFIG_LEGACY_PTY_COUNT=64 | ||
113 | CONFIG_PRINTER=m | 105 | CONFIG_PRINTER=m |
114 | CONFIG_PPDEV=m | 106 | CONFIG_PPDEV=m |
115 | # CONFIG_HW_RANDOM is not set | 107 | # CONFIG_HW_RANDOM is not set |
116 | # CONFIG_HWMON is not set | 108 | # CONFIG_HWMON is not set |
117 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
118 | CONFIG_FB=y | 109 | CONFIG_FB=y |
119 | CONFIG_FB_MODE_HELPERS=y | 110 | CONFIG_FB_MODE_HELPERS=y |
120 | CONFIG_FB_TILEBLITTING=y | 111 | CONFIG_FB_TILEBLITTING=y |
121 | CONFIG_DUMMY_CONSOLE_COLUMNS=128 | 112 | CONFIG_DUMMY_CONSOLE_COLUMNS=128 |
122 | CONFIG_DUMMY_CONSOLE_ROWS=48 | 113 | CONFIG_DUMMY_CONSOLE_ROWS=48 |
123 | CONFIG_FRAMEBUFFER_CONSOLE=y | 114 | CONFIG_FRAMEBUFFER_CONSOLE=y |
124 | CONFIG_FONTS=y | ||
125 | CONFIG_FONT_8x16=y | ||
126 | CONFIG_LOGO=y | 115 | CONFIG_LOGO=y |
127 | # CONFIG_LOGO_LINUX_MONO is not set | 116 | # CONFIG_LOGO_LINUX_MONO is not set |
128 | # CONFIG_LOGO_LINUX_VGA16 is not set | 117 | # CONFIG_LOGO_LINUX_VGA16 is not set |
129 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 118 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
130 | CONFIG_SOUND=y | 119 | CONFIG_SOUND=y |
131 | CONFIG_SND=y | 120 | CONFIG_SND=y |
132 | CONFIG_SND_SEQUENCER=y | ||
133 | CONFIG_SND_MIXER_OSS=y | ||
134 | CONFIG_SND_PCM_OSS=y | ||
135 | CONFIG_SND_SEQUENCER_OSS=y | ||
136 | CONFIG_SND_DYNAMIC_MINORS=y | 121 | CONFIG_SND_DYNAMIC_MINORS=y |
122 | CONFIG_SND_SEQUENCER=y | ||
137 | CONFIG_SND_AD1889=y | 123 | CONFIG_SND_AD1889=y |
138 | CONFIG_SND_HARMONY=y | 124 | CONFIG_SND_HARMONY=y |
139 | CONFIG_HID_GYRATION=y | 125 | CONFIG_HID_GYRATION=y |
@@ -141,7 +127,6 @@ CONFIG_HID_NTRIG=y | |||
141 | CONFIG_HID_PANTHERLORD=y | 127 | CONFIG_HID_PANTHERLORD=y |
142 | CONFIG_HID_PETALYNX=y | 128 | CONFIG_HID_PETALYNX=y |
143 | CONFIG_HID_SAMSUNG=y | 129 | CONFIG_HID_SAMSUNG=y |
144 | CONFIG_HID_SONY=y | ||
145 | CONFIG_HID_SUNPLUS=y | 130 | CONFIG_HID_SUNPLUS=y |
146 | CONFIG_HID_TOPSEED=y | 131 | CONFIG_HID_TOPSEED=y |
147 | CONFIG_USB=y | 132 | CONFIG_USB=y |
@@ -150,21 +135,15 @@ CONFIG_USB_OHCI_HCD=y | |||
150 | CONFIG_USB_UHCI_HCD=y | 135 | CONFIG_USB_UHCI_HCD=y |
151 | CONFIG_EXT2_FS=y | 136 | CONFIG_EXT2_FS=y |
152 | CONFIG_EXT3_FS=y | 137 | CONFIG_EXT3_FS=y |
153 | # CONFIG_EXT3_FS_XATTR is not set | ||
154 | CONFIG_AUTOFS_FS=y | ||
155 | CONFIG_ISO9660_FS=y | 138 | CONFIG_ISO9660_FS=y |
156 | CONFIG_JOLIET=y | 139 | CONFIG_JOLIET=y |
157 | CONFIG_VFAT_FS=y | 140 | CONFIG_VFAT_FS=y |
158 | CONFIG_PROC_KCORE=y | 141 | CONFIG_PROC_KCORE=y |
159 | CONFIG_TMPFS=y | 142 | CONFIG_TMPFS=y |
160 | CONFIG_NFS_FS=y | 143 | CONFIG_NFS_FS=y |
161 | CONFIG_NFS_V3=y | ||
162 | CONFIG_ROOT_NFS=y | 144 | CONFIG_ROOT_NFS=y |
163 | CONFIG_NFSD=y | 145 | CONFIG_NFSD=y |
164 | CONFIG_NFSD_V4=y | 146 | CONFIG_NFSD_V4=y |
165 | CONFIG_RPCSEC_GSS_SPKM3=m | ||
166 | CONFIG_SMB_FS=m | ||
167 | CONFIG_SMB_NLS_DEFAULT=y | ||
168 | CONFIG_CIFS=m | 147 | CONFIG_CIFS=m |
169 | CONFIG_NLS_CODEPAGE_437=y | 148 | CONFIG_NLS_CODEPAGE_437=y |
170 | CONFIG_NLS_CODEPAGE_737=m | 149 | CONFIG_NLS_CODEPAGE_737=m |
@@ -204,30 +183,24 @@ CONFIG_NLS_ISO8859_15=m | |||
204 | CONFIG_NLS_KOI8_R=m | 183 | CONFIG_NLS_KOI8_R=m |
205 | CONFIG_NLS_KOI8_U=m | 184 | CONFIG_NLS_KOI8_U=m |
206 | CONFIG_NLS_UTF8=y | 185 | CONFIG_NLS_UTF8=y |
207 | CONFIG_MAGIC_SYSRQ=y | ||
208 | CONFIG_DEBUG_FS=y | 186 | CONFIG_DEBUG_FS=y |
209 | CONFIG_HEADERS_CHECK=y | 187 | CONFIG_HEADERS_CHECK=y |
188 | CONFIG_MAGIC_SYSRQ=y | ||
210 | CONFIG_DEBUG_KERNEL=y | 189 | CONFIG_DEBUG_KERNEL=y |
211 | CONFIG_DEBUG_MUTEXES=y | 190 | CONFIG_DEBUG_MUTEXES=y |
212 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
213 | CONFIG_KEYS=y | 191 | CONFIG_KEYS=y |
214 | CONFIG_CRYPTO_NULL=m | ||
215 | CONFIG_CRYPTO_TEST=m | 192 | CONFIG_CRYPTO_TEST=m |
216 | CONFIG_CRYPTO_MD4=m | ||
217 | CONFIG_CRYPTO_MICHAEL_MIC=m | 193 | CONFIG_CRYPTO_MICHAEL_MIC=m |
218 | CONFIG_CRYPTO_SHA256=m | ||
219 | CONFIG_CRYPTO_SHA512=m | 194 | CONFIG_CRYPTO_SHA512=m |
220 | CONFIG_CRYPTO_TGR192=m | 195 | CONFIG_CRYPTO_TGR192=m |
221 | CONFIG_CRYPTO_WP512=m | 196 | CONFIG_CRYPTO_WP512=m |
222 | CONFIG_CRYPTO_AES=m | ||
223 | CONFIG_CRYPTO_ANUBIS=m | 197 | CONFIG_CRYPTO_ANUBIS=m |
224 | CONFIG_CRYPTO_ARC4=m | ||
225 | CONFIG_CRYPTO_BLOWFISH=m | 198 | CONFIG_CRYPTO_BLOWFISH=m |
226 | CONFIG_CRYPTO_CAST6=m | 199 | CONFIG_CRYPTO_CAST6=m |
227 | CONFIG_CRYPTO_KHAZAD=m | 200 | CONFIG_CRYPTO_KHAZAD=m |
228 | CONFIG_CRYPTO_SERPENT=m | 201 | CONFIG_CRYPTO_SERPENT=m |
229 | CONFIG_CRYPTO_TEA=m | 202 | CONFIG_CRYPTO_TEA=m |
230 | CONFIG_CRYPTO_TWOFISH=m | 203 | CONFIG_CRYPTO_TWOFISH=m |
231 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
232 | # CONFIG_CRYPTO_HW is not set | 204 | # CONFIG_CRYPTO_HW is not set |
233 | CONFIG_LIBCRC32C=m | 205 | CONFIG_LIBCRC32C=m |
206 | CONFIG_FONTS=y | ||
diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig index 8688ba7f5966..37ae4b57c001 100644 --- a/arch/parisc/configs/generic-32bit_defconfig +++ b/arch/parisc/configs/generic-32bit_defconfig | |||
@@ -2,15 +2,11 @@ CONFIG_LOCALVERSION="-32bit" | |||
2 | # CONFIG_LOCALVERSION_AUTO is not set | 2 | # CONFIG_LOCALVERSION_AUTO is not set |
3 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 4 | CONFIG_POSIX_MQUEUE=y |
5 | CONFIG_FHANDLE=y | ||
6 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
7 | CONFIG_IKCONFIG=y | 6 | CONFIG_IKCONFIG=y |
8 | CONFIG_IKCONFIG_PROC=y | 7 | CONFIG_IKCONFIG_PROC=y |
9 | CONFIG_LOG_BUF_SHIFT=16 | 8 | CONFIG_LOG_BUF_SHIFT=16 |
10 | CONFIG_BLK_DEV_INITRD=y | 9 | CONFIG_BLK_DEV_INITRD=y |
11 | CONFIG_RD_BZIP2=y | ||
12 | CONFIG_RD_LZMA=y | ||
13 | CONFIG_RD_LZO=y | ||
14 | CONFIG_EXPERT=y | 10 | CONFIG_EXPERT=y |
15 | CONFIG_SYSCTL_SYSCALL=y | 11 | CONFIG_SYSCTL_SYSCALL=y |
16 | CONFIG_PERF_EVENTS=y | 12 | CONFIG_PERF_EVENTS=y |
@@ -49,7 +45,6 @@ CONFIG_INET_ESP=m | |||
49 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 45 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
50 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 46 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
51 | # CONFIG_INET_XFRM_MODE_BEET is not set | 47 | # CONFIG_INET_XFRM_MODE_BEET is not set |
52 | # CONFIG_INET_LRO is not set | ||
53 | CONFIG_INET_DIAG=m | 48 | CONFIG_INET_DIAG=m |
54 | CONFIG_LLC2=m | 49 | CONFIG_LLC2=m |
55 | # CONFIG_WIRELESS is not set | 50 | # CONFIG_WIRELESS is not set |
@@ -149,10 +144,8 @@ CONFIG_PRINTER=m | |||
149 | CONFIG_PPDEV=m | 144 | CONFIG_PPDEV=m |
150 | # CONFIG_HW_RANDOM is not set | 145 | # CONFIG_HW_RANDOM is not set |
151 | CONFIG_I2C=y | 146 | CONFIG_I2C=y |
152 | CONFIG_POWER_SUPPLY=y | ||
153 | # CONFIG_HWMON is not set | 147 | # CONFIG_HWMON is not set |
154 | CONFIG_AGP=y | 148 | CONFIG_AGP=y |
155 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
156 | CONFIG_FB=y | 149 | CONFIG_FB=y |
157 | CONFIG_FB_FOREIGN_ENDIAN=y | 150 | CONFIG_FB_FOREIGN_ENDIAN=y |
158 | CONFIG_FB_MODE_HELPERS=y | 151 | CONFIG_FB_MODE_HELPERS=y |
@@ -169,11 +162,8 @@ CONFIG_LOGO=y | |||
169 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 162 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
170 | CONFIG_SOUND=m | 163 | CONFIG_SOUND=m |
171 | CONFIG_SND=m | 164 | CONFIG_SND=m |
172 | CONFIG_SND_SEQUENCER=m | ||
173 | CONFIG_SND_MIXER_OSS=m | ||
174 | CONFIG_SND_PCM_OSS=m | ||
175 | CONFIG_SND_SEQUENCER_OSS=y | ||
176 | CONFIG_SND_DYNAMIC_MINORS=y | 165 | CONFIG_SND_DYNAMIC_MINORS=y |
166 | CONFIG_SND_SEQUENCER=m | ||
177 | CONFIG_SND_AD1889=m | 167 | CONFIG_SND_AD1889=m |
178 | CONFIG_SND_HARMONY=m | 168 | CONFIG_SND_HARMONY=m |
179 | CONFIG_HIDRAW=y | 169 | CONFIG_HIDRAW=y |
@@ -223,12 +213,7 @@ CONFIG_EXT2_FS=y | |||
223 | CONFIG_EXT2_FS_XATTR=y | 213 | CONFIG_EXT2_FS_XATTR=y |
224 | CONFIG_EXT2_FS_SECURITY=y | 214 | CONFIG_EXT2_FS_SECURITY=y |
225 | CONFIG_EXT3_FS=y | 215 | CONFIG_EXT3_FS=y |
226 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
227 | CONFIG_EXT3_FS_SECURITY=y | 216 | CONFIG_EXT3_FS_SECURITY=y |
228 | CONFIG_EXT4_FS=y | ||
229 | CONFIG_XFS_FS=m | ||
230 | CONFIG_XFS_QUOTA=y | ||
231 | CONFIG_XFS_RT=y | ||
232 | CONFIG_QUOTA=y | 217 | CONFIG_QUOTA=y |
233 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 218 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
234 | CONFIG_QFMT_V2=y | 219 | CONFIG_QFMT_V2=y |
@@ -293,15 +278,12 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
293 | CONFIG_DEBUG_STACKOVERFLOW=y | 278 | CONFIG_DEBUG_STACKOVERFLOW=y |
294 | CONFIG_DEBUG_SHIRQ=y | 279 | CONFIG_DEBUG_SHIRQ=y |
295 | CONFIG_DETECT_HUNG_TASK=y | 280 | CONFIG_DETECT_HUNG_TASK=y |
296 | CONFIG_TIMER_STATS=y | ||
297 | CONFIG_DEBUG_RT_MUTEXES=y | 281 | CONFIG_DEBUG_RT_MUTEXES=y |
298 | CONFIG_DEBUG_SPINLOCK=y | 282 | CONFIG_DEBUG_SPINLOCK=y |
299 | CONFIG_DEBUG_MUTEXES=y | 283 | CONFIG_DEBUG_MUTEXES=y |
300 | CONFIG_RCU_CPU_STALL_INFO=y | ||
301 | CONFIG_LATENCYTOP=y | 284 | CONFIG_LATENCYTOP=y |
302 | CONFIG_LKDTM=m | 285 | CONFIG_LKDTM=m |
303 | CONFIG_KEYS=y | 286 | CONFIG_KEYS=y |
304 | CONFIG_CRYPTO_NULL=m | ||
305 | CONFIG_CRYPTO_TEST=m | 287 | CONFIG_CRYPTO_TEST=m |
306 | CONFIG_CRYPTO_HMAC=y | 288 | CONFIG_CRYPTO_HMAC=y |
307 | CONFIG_CRYPTO_MD5=y | 289 | CONFIG_CRYPTO_MD5=y |
@@ -320,7 +302,6 @@ CONFIG_CRYPTO_SERPENT=m | |||
320 | CONFIG_CRYPTO_TEA=m | 302 | CONFIG_CRYPTO_TEA=m |
321 | CONFIG_CRYPTO_TWOFISH=m | 303 | CONFIG_CRYPTO_TWOFISH=m |
322 | CONFIG_CRYPTO_DEFLATE=y | 304 | CONFIG_CRYPTO_DEFLATE=y |
323 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
324 | CONFIG_CRC_CCITT=m | 305 | CONFIG_CRC_CCITT=m |
325 | CONFIG_CRC_T10DIF=y | 306 | CONFIG_CRC_T10DIF=y |
326 | CONFIG_FONTS=y | 307 | CONFIG_FONTS=y |
diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig index c564e6e1fa23..d39e7f821aba 100644 --- a/arch/parisc/configs/generic-64bit_defconfig +++ b/arch/parisc/configs/generic-64bit_defconfig | |||
@@ -8,10 +8,11 @@ CONFIG_TASKSTATS=y | |||
8 | CONFIG_TASK_DELAY_ACCT=y | 8 | CONFIG_TASK_DELAY_ACCT=y |
9 | CONFIG_TASK_XACCT=y | 9 | CONFIG_TASK_XACCT=y |
10 | CONFIG_TASK_IO_ACCOUNTING=y | 10 | CONFIG_TASK_IO_ACCOUNTING=y |
11 | # CONFIG_UTS_NS is not set | 11 | CONFIG_CGROUPS=y |
12 | # CONFIG_IPC_NS is not set | 12 | CONFIG_MEMCG=y |
13 | # CONFIG_PID_NS is not set | 13 | CONFIG_MEMCG_SWAP=y |
14 | # CONFIG_NET_NS is not set | 14 | CONFIG_CGROUP_PIDS=y |
15 | CONFIG_CPUSETS=y | ||
15 | CONFIG_RELAY=y | 16 | CONFIG_RELAY=y |
16 | CONFIG_BLK_DEV_INITRD=y | 17 | CONFIG_BLK_DEV_INITRD=y |
17 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 18 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -52,7 +53,6 @@ CONFIG_INET_ESP=m | |||
52 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 53 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
53 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 54 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
54 | CONFIG_INET_XFRM_MODE_BEET=m | 55 | CONFIG_INET_XFRM_MODE_BEET=m |
55 | CONFIG_INET_LRO=m | ||
56 | CONFIG_INET_DIAG=m | 56 | CONFIG_INET_DIAG=m |
57 | CONFIG_NETFILTER=y | 57 | CONFIG_NETFILTER=y |
58 | # CONFIG_NETFILTER_ADVANCED is not set | 58 | # CONFIG_NETFILTER_ADVANCED is not set |
@@ -84,7 +84,6 @@ CONFIG_PATA_SIL680=y | |||
84 | CONFIG_ATA_GENERIC=y | 84 | CONFIG_ATA_GENERIC=y |
85 | CONFIG_MD=y | 85 | CONFIG_MD=y |
86 | CONFIG_MD_LINEAR=m | 86 | CONFIG_MD_LINEAR=m |
87 | CONFIG_MD_RAID0=m | ||
88 | CONFIG_BLK_DEV_DM=m | 87 | CONFIG_BLK_DEV_DM=m |
89 | CONFIG_DM_RAID=m | 88 | CONFIG_DM_RAID=m |
90 | CONFIG_DM_UEVENT=y | 89 | CONFIG_DM_UEVENT=y |
@@ -138,21 +137,21 @@ CONFIG_QLGE=m | |||
138 | # CONFIG_NET_VENDOR_TI is not set | 137 | # CONFIG_NET_VENDOR_TI is not set |
139 | # CONFIG_NET_VENDOR_VIA is not set | 138 | # CONFIG_NET_VENDOR_VIA is not set |
140 | # CONFIG_NET_VENDOR_WIZNET is not set | 139 | # CONFIG_NET_VENDOR_WIZNET is not set |
140 | CONFIG_MDIO_BITBANG=m | ||
141 | CONFIG_PHYLIB=y | 141 | CONFIG_PHYLIB=y |
142 | CONFIG_MARVELL_PHY=m | ||
143 | CONFIG_DAVICOM_PHY=m | ||
144 | CONFIG_QSEMI_PHY=m | ||
145 | CONFIG_LXT_PHY=m | ||
146 | CONFIG_CICADA_PHY=m | ||
147 | CONFIG_VITESSE_PHY=m | ||
148 | CONFIG_SMSC_PHY=m | ||
149 | CONFIG_BROADCOM_PHY=m | 142 | CONFIG_BROADCOM_PHY=m |
143 | CONFIG_CICADA_PHY=m | ||
144 | CONFIG_DAVICOM_PHY=m | ||
150 | CONFIG_ICPLUS_PHY=m | 145 | CONFIG_ICPLUS_PHY=m |
151 | CONFIG_REALTEK_PHY=m | 146 | CONFIG_LSI_ET1011C_PHY=m |
147 | CONFIG_LXT_PHY=m | ||
148 | CONFIG_MARVELL_PHY=m | ||
152 | CONFIG_NATIONAL_PHY=m | 149 | CONFIG_NATIONAL_PHY=m |
150 | CONFIG_QSEMI_PHY=m | ||
151 | CONFIG_REALTEK_PHY=m | ||
152 | CONFIG_SMSC_PHY=m | ||
153 | CONFIG_STE10XP=m | 153 | CONFIG_STE10XP=m |
154 | CONFIG_LSI_ET1011C_PHY=m | 154 | CONFIG_VITESSE_PHY=m |
155 | CONFIG_MDIO_BITBANG=m | ||
156 | CONFIG_SLIP=m | 155 | CONFIG_SLIP=m |
157 | CONFIG_SLIP_COMPRESSED=y | 156 | CONFIG_SLIP_COMPRESSED=y |
158 | CONFIG_SLIP_SMART=y | 157 | CONFIG_SLIP_SMART=y |
@@ -166,10 +165,8 @@ CONFIG_INPUT_MISC=y | |||
166 | CONFIG_SERIO_SERPORT=m | 165 | CONFIG_SERIO_SERPORT=m |
167 | # CONFIG_HP_SDC is not set | 166 | # CONFIG_HP_SDC is not set |
168 | CONFIG_SERIO_RAW=m | 167 | CONFIG_SERIO_RAW=m |
169 | CONFIG_DEVPTS_MULTIPLE_INSTANCES=y | ||
170 | # CONFIG_LEGACY_PTYS is not set | 168 | # CONFIG_LEGACY_PTYS is not set |
171 | CONFIG_NOZOMI=m | 169 | CONFIG_NOZOMI=m |
172 | # CONFIG_DEVKMEM is not set | ||
173 | CONFIG_SERIAL_8250=y | 170 | CONFIG_SERIAL_8250=y |
174 | # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set | 171 | # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set |
175 | CONFIG_SERIAL_8250_CONSOLE=y | 172 | CONFIG_SERIAL_8250_CONSOLE=y |
@@ -207,10 +204,8 @@ CONFIG_AGP=y | |||
207 | CONFIG_AGP_PARISC=y | 204 | CONFIG_AGP_PARISC=y |
208 | CONFIG_DRM=y | 205 | CONFIG_DRM=y |
209 | CONFIG_DRM_RADEON=y | 206 | CONFIG_DRM_RADEON=y |
210 | CONFIG_DRM_RADEON_UMS=y | ||
211 | CONFIG_FIRMWARE_EDID=y | 207 | CONFIG_FIRMWARE_EDID=y |
212 | CONFIG_FB_MODE_HELPERS=y | 208 | CONFIG_FB_MODE_HELPERS=y |
213 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
214 | # CONFIG_BACKLIGHT_GENERIC is not set | 209 | # CONFIG_BACKLIGHT_GENERIC is not set |
215 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | 210 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y |
216 | CONFIG_LOGO=y | 211 | CONFIG_LOGO=y |
@@ -246,8 +241,6 @@ CONFIG_EXT2_FS_XATTR=y | |||
246 | CONFIG_EXT2_FS_SECURITY=y | 241 | CONFIG_EXT2_FS_SECURITY=y |
247 | CONFIG_EXT3_FS=y | 242 | CONFIG_EXT3_FS=y |
248 | CONFIG_EXT3_FS_SECURITY=y | 243 | CONFIG_EXT3_FS_SECURITY=y |
249 | CONFIG_EXT4_FS=y | ||
250 | CONFIG_EXT4_FS_SECURITY=y | ||
251 | CONFIG_XFS_FS=m | 244 | CONFIG_XFS_FS=m |
252 | CONFIG_BTRFS_FS=m | 245 | CONFIG_BTRFS_FS=m |
253 | CONFIG_QUOTA=y | 246 | CONFIG_QUOTA=y |
@@ -286,27 +279,16 @@ CONFIG_DEBUG_FS=y | |||
286 | CONFIG_MAGIC_SYSRQ=y | 279 | CONFIG_MAGIC_SYSRQ=y |
287 | CONFIG_DEBUG_KERNEL=y | 280 | CONFIG_DEBUG_KERNEL=y |
288 | CONFIG_DEBUG_STACKOVERFLOW=y | 281 | CONFIG_DEBUG_STACKOVERFLOW=y |
289 | CONFIG_LOCKUP_DETECTOR=y | ||
290 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y | ||
291 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y | ||
292 | # CONFIG_SCHED_DEBUG is not set | 282 | # CONFIG_SCHED_DEBUG is not set |
293 | CONFIG_TIMER_STATS=y | ||
294 | CONFIG_CRYPTO_MANAGER=y | 283 | CONFIG_CRYPTO_MANAGER=y |
295 | CONFIG_CRYPTO_ECB=m | 284 | CONFIG_CRYPTO_ECB=m |
296 | CONFIG_CRYPTO_PCBC=m | 285 | CONFIG_CRYPTO_PCBC=m |
297 | CONFIG_CRYPTO_MD4=m | 286 | CONFIG_CRYPTO_MD4=m |
298 | CONFIG_CRYPTO_MD5=y | 287 | CONFIG_CRYPTO_MD5=y |
299 | CONFIG_CRYPTO_MICHAEL_MIC=m | 288 | CONFIG_CRYPTO_MICHAEL_MIC=m |
300 | CONFIG_CRYPTO_SHA256=m | ||
301 | CONFIG_CRYPTO_ARC4=m | 289 | CONFIG_CRYPTO_ARC4=m |
302 | CONFIG_CRYPTO_FCRYPT=m | 290 | CONFIG_CRYPTO_FCRYPT=m |
303 | CONFIG_CRYPTO_DEFLATE=m | 291 | CONFIG_CRYPTO_DEFLATE=m |
304 | # CONFIG_CRYPTO_HW is not set | 292 | # CONFIG_CRYPTO_HW is not set |
305 | CONFIG_CRC_CCITT=m | 293 | CONFIG_CRC_CCITT=m |
306 | CONFIG_LIBCRC32C=y | 294 | CONFIG_LIBCRC32C=y |
307 | CONFIG_XZ_DEC_X86=y | ||
308 | CONFIG_XZ_DEC_POWERPC=y | ||
309 | CONFIG_XZ_DEC_IA64=y | ||
310 | CONFIG_XZ_DEC_ARM=y | ||
311 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
312 | CONFIG_XZ_DEC_SPARC=y | ||
diff --git a/arch/parisc/include/asm/pdcpat.h b/arch/parisc/include/asm/pdcpat.h index 32e105fb8adb..e3c0586260d8 100644 --- a/arch/parisc/include/asm/pdcpat.h +++ b/arch/parisc/include/asm/pdcpat.h | |||
@@ -150,7 +150,7 @@ | |||
150 | #define PDC_PAT_MEM_SETGM 9L /* Set Good Memory value */ | 150 | #define PDC_PAT_MEM_SETGM 9L /* Set Good Memory value */ |
151 | #define PDC_PAT_MEM_ADD_PAGE 10L /* ADDs a page to the cell */ | 151 | #define PDC_PAT_MEM_ADD_PAGE 10L /* ADDs a page to the cell */ |
152 | #define PDC_PAT_MEM_ADDRESS 11L /* Get Physical Location From */ | 152 | #define PDC_PAT_MEM_ADDRESS 11L /* Get Physical Location From */ |
153 | /* Memory Address */ | 153 | /* Memory Address */ |
154 | #define PDC_PAT_MEM_GET_TXT_SIZE 12L /* Get Formatted Text Size */ | 154 | #define PDC_PAT_MEM_GET_TXT_SIZE 12L /* Get Formatted Text Size */ |
155 | #define PDC_PAT_MEM_GET_PD_TXT 13L /* Get PD Formatted Text */ | 155 | #define PDC_PAT_MEM_GET_PD_TXT 13L /* Get PD Formatted Text */ |
156 | #define PDC_PAT_MEM_GET_CELL_TXT 14L /* Get Cell Formatted Text */ | 156 | #define PDC_PAT_MEM_GET_CELL_TXT 14L /* Get Cell Formatted Text */ |
@@ -228,6 +228,17 @@ struct pdc_pat_mem_read_pd_retinfo { /* PDC_PAT_MEM/PDC_PAT_MEM_PD_READ */ | |||
228 | unsigned long pdt_entries; | 228 | unsigned long pdt_entries; |
229 | }; | 229 | }; |
230 | 230 | ||
231 | struct pdc_pat_mem_phys_mem_location { /* PDC_PAT_MEM/PDC_PAT_MEM_ADDRESS */ | ||
232 | u64 cabinet:8; | ||
233 | u64 ign1:8; | ||
234 | u64 ign2:8; | ||
235 | u64 cell_slot:8; | ||
236 | u64 ign3:8; | ||
237 | u64 dimm_slot:8; /* DIMM slot, e.g. 0x1A, 0x2B, show user hex value! */ | ||
238 | u64 ign4:8; | ||
239 | u64 source:4; /* for mem: always 0x07 */ | ||
240 | u64 source_detail:4; /* for mem: always 0x04 (SIMM or DIMM) */ | ||
241 | }; | ||
231 | 242 | ||
232 | struct pdc_pat_pd_addr_map_entry { | 243 | struct pdc_pat_pd_addr_map_entry { |
233 | unsigned char entry_type; /* 1 = Memory Descriptor Entry Type */ | 244 | unsigned char entry_type; /* 1 = Memory Descriptor Entry Type */ |
@@ -319,6 +330,9 @@ extern int pdc_pat_mem_read_cell_pdt(struct pdc_pat_mem_read_pd_retinfo *pret, | |||
319 | extern int pdc_pat_mem_read_pd_pdt(struct pdc_pat_mem_read_pd_retinfo *pret, | 330 | extern int pdc_pat_mem_read_pd_pdt(struct pdc_pat_mem_read_pd_retinfo *pret, |
320 | unsigned long *pdt_entries_ptr, unsigned long count, | 331 | unsigned long *pdt_entries_ptr, unsigned long count, |
321 | unsigned long offset); | 332 | unsigned long offset); |
333 | extern int pdc_pat_mem_get_dimm_phys_location( | ||
334 | struct pdc_pat_mem_phys_mem_location *pret, | ||
335 | unsigned long phys_addr); | ||
322 | 336 | ||
323 | #endif /* __ASSEMBLY__ */ | 337 | #endif /* __ASSEMBLY__ */ |
324 | 338 | ||
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index c32a09095216..85a92db70afc 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c | |||
@@ -453,8 +453,8 @@ void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, | |||
453 | before it can be accessed through the kernel mapping. */ | 453 | before it can be accessed through the kernel mapping. */ |
454 | preempt_disable(); | 454 | preempt_disable(); |
455 | flush_dcache_page_asm(__pa(vfrom), vaddr); | 455 | flush_dcache_page_asm(__pa(vfrom), vaddr); |
456 | preempt_enable(); | ||
457 | copy_page_asm(vto, vfrom); | 456 | copy_page_asm(vto, vfrom); |
457 | preempt_enable(); | ||
458 | } | 458 | } |
459 | EXPORT_SYMBOL(copy_user_page); | 459 | EXPORT_SYMBOL(copy_user_page); |
460 | 460 | ||
@@ -539,6 +539,10 @@ void flush_cache_mm(struct mm_struct *mm) | |||
539 | struct vm_area_struct *vma; | 539 | struct vm_area_struct *vma; |
540 | pgd_t *pgd; | 540 | pgd_t *pgd; |
541 | 541 | ||
542 | /* Flush the TLB to avoid speculation if coherency is required. */ | ||
543 | if (parisc_requires_coherency()) | ||
544 | flush_tlb_all(); | ||
545 | |||
542 | /* Flushing the whole cache on each cpu takes forever on | 546 | /* Flushing the whole cache on each cpu takes forever on |
543 | rp3440, etc. So, avoid it if the mm isn't too big. */ | 547 | rp3440, etc. So, avoid it if the mm isn't too big. */ |
544 | if (mm_total_size(mm) >= parisc_cache_flush_threshold) { | 548 | if (mm_total_size(mm) >= parisc_cache_flush_threshold) { |
@@ -577,33 +581,22 @@ void flush_cache_mm(struct mm_struct *mm) | |||
577 | void flush_cache_range(struct vm_area_struct *vma, | 581 | void flush_cache_range(struct vm_area_struct *vma, |
578 | unsigned long start, unsigned long end) | 582 | unsigned long start, unsigned long end) |
579 | { | 583 | { |
580 | unsigned long addr; | ||
581 | pgd_t *pgd; | ||
582 | |||
583 | BUG_ON(!vma->vm_mm->context); | 584 | BUG_ON(!vma->vm_mm->context); |
584 | 585 | ||
586 | /* Flush the TLB to avoid speculation if coherency is required. */ | ||
587 | if (parisc_requires_coherency()) | ||
588 | flush_tlb_range(vma, start, end); | ||
589 | |||
585 | if ((end - start) >= parisc_cache_flush_threshold) { | 590 | if ((end - start) >= parisc_cache_flush_threshold) { |
586 | flush_cache_all(); | 591 | flush_cache_all(); |
587 | return; | 592 | return; |
588 | } | 593 | } |
589 | 594 | ||
590 | if (vma->vm_mm->context == mfsp(3)) { | 595 | BUG_ON(vma->vm_mm->context != mfsp(3)); |
591 | flush_user_dcache_range_asm(start, end); | ||
592 | if (vma->vm_flags & VM_EXEC) | ||
593 | flush_user_icache_range_asm(start, end); | ||
594 | return; | ||
595 | } | ||
596 | 596 | ||
597 | pgd = vma->vm_mm->pgd; | 597 | flush_user_dcache_range_asm(start, end); |
598 | for (addr = start & PAGE_MASK; addr < end; addr += PAGE_SIZE) { | 598 | if (vma->vm_flags & VM_EXEC) |
599 | unsigned long pfn; | 599 | flush_user_icache_range_asm(start, end); |
600 | pte_t *ptep = get_ptep(pgd, addr); | ||
601 | if (!ptep) | ||
602 | continue; | ||
603 | pfn = pte_pfn(*ptep); | ||
604 | if (pfn_valid(pfn)) | ||
605 | __flush_cache_page(vma, addr, PFN_PHYS(pfn)); | ||
606 | } | ||
607 | } | 600 | } |
608 | 601 | ||
609 | void | 602 | void |
@@ -612,7 +605,8 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long | |||
612 | BUG_ON(!vma->vm_mm->context); | 605 | BUG_ON(!vma->vm_mm->context); |
613 | 606 | ||
614 | if (pfn_valid(pfn)) { | 607 | if (pfn_valid(pfn)) { |
615 | flush_tlb_page(vma, vmaddr); | 608 | if (parisc_requires_coherency()) |
609 | flush_tlb_page(vma, vmaddr); | ||
616 | __flush_cache_page(vma, vmaddr, PFN_PHYS(pfn)); | 610 | __flush_cache_page(vma, vmaddr, PFN_PHYS(pfn)); |
617 | } | 611 | } |
618 | } | 612 | } |
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index 98190252c12f..f622a311d04a 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c | |||
@@ -1481,12 +1481,44 @@ int pdc_pat_mem_read_pd_pdt(struct pdc_pat_mem_read_pd_retinfo *pret, | |||
1481 | unsigned long offset) | 1481 | unsigned long offset) |
1482 | { | 1482 | { |
1483 | int retval; | 1483 | int retval; |
1484 | unsigned long flags; | 1484 | unsigned long flags, entries; |
1485 | 1485 | ||
1486 | spin_lock_irqsave(&pdc_lock, flags); | 1486 | spin_lock_irqsave(&pdc_lock, flags); |
1487 | retval = mem_pdc_call(PDC_PAT_MEM, PDC_PAT_MEM_PD_READ, | 1487 | retval = mem_pdc_call(PDC_PAT_MEM, PDC_PAT_MEM_PD_READ, |
1488 | __pa(&pret), __pa(pdt_entries_ptr), | 1488 | __pa(&pdc_result), __pa(pdt_entries_ptr), |
1489 | count, offset); | 1489 | count, offset); |
1490 | |||
1491 | if (retval == PDC_OK) { | ||
1492 | entries = min(pdc_result[0], count); | ||
1493 | pret->actual_count_bytes = entries; | ||
1494 | pret->pdt_entries = entries / sizeof(unsigned long); | ||
1495 | } | ||
1496 | |||
1497 | spin_unlock_irqrestore(&pdc_lock, flags); | ||
1498 | |||
1499 | return retval; | ||
1500 | } | ||
1501 | |||
1502 | /** | ||
1503 | * pdc_pat_mem_get_dimm_phys_location - Get physical DIMM slot via PAT firmware | ||
1504 | * @pret: ptr to hold returned information | ||
1505 | * @phys_addr: physical address to examine | ||
1506 | * | ||
1507 | */ | ||
1508 | int pdc_pat_mem_get_dimm_phys_location( | ||
1509 | struct pdc_pat_mem_phys_mem_location *pret, | ||
1510 | unsigned long phys_addr) | ||
1511 | { | ||
1512 | int retval; | ||
1513 | unsigned long flags; | ||
1514 | |||
1515 | spin_lock_irqsave(&pdc_lock, flags); | ||
1516 | retval = mem_pdc_call(PDC_PAT_MEM, PDC_PAT_MEM_ADDRESS, | ||
1517 | __pa(&pdc_result), phys_addr); | ||
1518 | |||
1519 | if (retval == PDC_OK) | ||
1520 | memcpy(pret, &pdc_result, sizeof(*pret)); | ||
1521 | |||
1490 | spin_unlock_irqrestore(&pdc_lock, flags); | 1522 | spin_unlock_irqrestore(&pdc_lock, flags); |
1491 | 1523 | ||
1492 | return retval; | 1524 | return retval; |
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index ba5e1c7b1f17..5404e4086cb9 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c | |||
@@ -413,6 +413,10 @@ static inline void stack_overflow_check(struct pt_regs *regs) | |||
413 | if (regs->sr[7]) | 413 | if (regs->sr[7]) |
414 | return; | 414 | return; |
415 | 415 | ||
416 | /* exit if already in panic */ | ||
417 | if (sysctl_panic_on_stackoverflow < 0) | ||
418 | return; | ||
419 | |||
416 | /* calculate kernel stack usage */ | 420 | /* calculate kernel stack usage */ |
417 | stack_usage = sp - stack_start; | 421 | stack_usage = sp - stack_start; |
418 | #ifdef CONFIG_IRQSTACKS | 422 | #ifdef CONFIG_IRQSTACKS |
@@ -454,8 +458,10 @@ check_kernel_stack: | |||
454 | #ifdef CONFIG_IRQSTACKS | 458 | #ifdef CONFIG_IRQSTACKS |
455 | panic_check: | 459 | panic_check: |
456 | #endif | 460 | #endif |
457 | if (sysctl_panic_on_stackoverflow) | 461 | if (sysctl_panic_on_stackoverflow) { |
462 | sysctl_panic_on_stackoverflow = -1; /* disable further checks */ | ||
458 | panic("low stack detected by irq handler - check messages\n"); | 463 | panic("low stack detected by irq handler - check messages\n"); |
464 | } | ||
459 | #endif | 465 | #endif |
460 | } | 466 | } |
461 | 467 | ||
diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c index f3a797e670b0..d02874ecb94d 100644 --- a/arch/parisc/kernel/pdt.c +++ b/arch/parisc/kernel/pdt.c | |||
@@ -112,10 +112,12 @@ void __init pdc_pdt_init(void) | |||
112 | #ifdef CONFIG_64BIT | 112 | #ifdef CONFIG_64BIT |
113 | struct pdc_pat_mem_read_pd_retinfo pat_pret; | 113 | struct pdc_pat_mem_read_pd_retinfo pat_pret; |
114 | 114 | ||
115 | /* try old obsolete PAT firmware function first */ | ||
116 | pdt_type = PDT_PAT_OLD; | ||
115 | ret = pdc_pat_mem_read_cell_pdt(&pat_pret, pdt_entry, | 117 | ret = pdc_pat_mem_read_cell_pdt(&pat_pret, pdt_entry, |
116 | MAX_PDT_ENTRIES); | 118 | MAX_PDT_ENTRIES); |
117 | if (ret != PDC_OK) { | 119 | if (ret != PDC_OK) { |
118 | pdt_type = PDT_PAT_OLD; | 120 | pdt_type = PDT_PAT_NEW; |
119 | ret = pdc_pat_mem_read_pd_pdt(&pat_pret, pdt_entry, | 121 | ret = pdc_pat_mem_read_pd_pdt(&pat_pret, pdt_entry, |
120 | MAX_PDT_TABLE_SIZE, 0); | 122 | MAX_PDT_TABLE_SIZE, 0); |
121 | } | 123 | } |
@@ -131,11 +133,20 @@ void __init pdc_pdt_init(void) | |||
131 | } | 133 | } |
132 | 134 | ||
133 | for (i = 0; i < pdt_status.pdt_entries; i++) { | 135 | for (i = 0; i < pdt_status.pdt_entries; i++) { |
134 | if (i < 20) | 136 | struct pdc_pat_mem_phys_mem_location loc; |
135 | pr_warn("PDT: BAD PAGE #%d at 0x%08lx (error_type = %lu)\n", | 137 | |
136 | i, | 138 | /* get DIMM slot number */ |
137 | pdt_entry[i] & PAGE_MASK, | 139 | loc.dimm_slot = 0xff; |
138 | pdt_entry[i] & 1); | 140 | #ifdef CONFIG_64BIT |
141 | pdc_pat_mem_get_dimm_phys_location(&loc, pdt_entry[i]); | ||
142 | #endif | ||
143 | |||
144 | pr_warn("PDT: BAD PAGE #%d at 0x%08lx, " | ||
145 | "DIMM slot %02x (error_type = %lu)\n", | ||
146 | i, | ||
147 | pdt_entry[i] & PAGE_MASK, | ||
148 | loc.dimm_slot, | ||
149 | pdt_entry[i] & 1); | ||
139 | 150 | ||
140 | /* mark memory page bad */ | 151 | /* mark memory page bad */ |
141 | memblock_reserve(pdt_entry[i] & PAGE_MASK, PAGE_SIZE); | 152 | memblock_reserve(pdt_entry[i] & PAGE_MASK, PAGE_SIZE); |
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index b64d7d21646e..a45a67d526f8 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c | |||
@@ -53,6 +53,7 @@ | |||
53 | #include <linux/uaccess.h> | 53 | #include <linux/uaccess.h> |
54 | #include <linux/rcupdate.h> | 54 | #include <linux/rcupdate.h> |
55 | #include <linux/random.h> | 55 | #include <linux/random.h> |
56 | #include <linux/nmi.h> | ||
56 | 57 | ||
57 | #include <asm/io.h> | 58 | #include <asm/io.h> |
58 | #include <asm/asm-offsets.h> | 59 | #include <asm/asm-offsets.h> |
@@ -145,6 +146,7 @@ void machine_power_off(void) | |||
145 | 146 | ||
146 | /* prevent soft lockup/stalled CPU messages for endless loop. */ | 147 | /* prevent soft lockup/stalled CPU messages for endless loop. */ |
147 | rcu_sysrq_start(); | 148 | rcu_sysrq_start(); |
149 | lockup_detector_suspend(); | ||
148 | for (;;); | 150 | for (;;); |
149 | } | 151 | } |
150 | 152 | ||
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 3d6ef1b29c6a..ffe2cbf52d1a 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
@@ -78,6 +78,8 @@ SECTIONS | |||
78 | *(.text.sys_exit) | 78 | *(.text.sys_exit) |
79 | *(.text.do_sigaltstack) | 79 | *(.text.do_sigaltstack) |
80 | *(.text.do_fork) | 80 | *(.text.do_fork) |
81 | *(.text.div) | ||
82 | *($$*) /* millicode routines */ | ||
81 | *(.text.*) | 83 | *(.text.*) |
82 | *(.fixup) | 84 | *(.fixup) |
83 | *(.lock.text) /* out-of-line lock text */ | 85 | *(.lock.text) /* out-of-line lock text */ |
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c index 055f83fddc18..7147aa53e9a2 100644 --- a/drivers/parisc/pdc_stable.c +++ b/drivers/parisc/pdc_stable.c | |||
@@ -954,7 +954,7 @@ static struct attribute *pdcs_subsys_attrs[] = { | |||
954 | NULL, | 954 | NULL, |
955 | }; | 955 | }; |
956 | 956 | ||
957 | static struct attribute_group pdcs_attr_group = { | 957 | static const struct attribute_group pdcs_attr_group = { |
958 | .attrs = pdcs_subsys_attrs, | 958 | .attrs = pdcs_subsys_attrs, |
959 | }; | 959 | }; |
960 | 960 | ||