aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/parisc/configs/712_defconfig41
-rw-r--r--arch/parisc/configs/a500_defconfig50
-rw-r--r--arch/parisc/configs/b180_defconfig17
-rw-r--r--arch/parisc/configs/c3000_defconfig38
-rw-r--r--arch/parisc/configs/c8000_defconfig17
-rw-r--r--arch/parisc/configs/default_defconfig49
-rw-r--r--arch/parisc/configs/generic-32bit_defconfig21
-rw-r--r--arch/parisc/configs/generic-64bit_defconfig48
-rw-r--r--arch/parisc/include/asm/pdcpat.h16
-rw-r--r--arch/parisc/kernel/cache.c36
-rw-r--r--arch/parisc/kernel/firmware.c36
-rw-r--r--arch/parisc/kernel/irq.c8
-rw-r--r--arch/parisc/kernel/pdt.c23
-rw-r--r--arch/parisc/kernel/process.c2
-rw-r--r--arch/parisc/kernel/vmlinux.lds.S2
-rw-r--r--drivers/parisc/pdc_stable.c2
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 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
8CONFIG_SYSFS_DEPRECATED_V2=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
11CONFIG_SLAB=y 9CONFIG_SLAB=y
@@ -14,7 +12,6 @@ CONFIG_OPROFILE=m
14CONFIG_MODULES=y 12CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
16CONFIG_MODULE_FORCE_UNLOAD=y 14CONFIG_MODULE_FORCE_UNLOAD=y
17# CONFIG_BLK_DEV_BSG is not set
18CONFIG_PA7100LC=y 15CONFIG_PA7100LC=y
19CONFIG_PREEMPT_VOLUNTARY=y 16CONFIG_PREEMPT_VOLUNTARY=y
20CONFIG_GSC_LASI=y 17CONFIG_GSC_LASI=y
@@ -32,11 +29,9 @@ CONFIG_IP_PNP_DHCP=y
32CONFIG_IP_PNP_BOOTP=y 29CONFIG_IP_PNP_BOOTP=y
33CONFIG_INET_AH=m 30CONFIG_INET_AH=m
34CONFIG_INET_ESP=m 31CONFIG_INET_ESP=m
35# CONFIG_INET_LRO is not set
36CONFIG_INET_DIAG=m 32CONFIG_INET_DIAG=m
37# CONFIG_IPV6 is not set 33# CONFIG_IPV6 is not set
38CONFIG_NETFILTER=y 34CONFIG_NETFILTER=y
39CONFIG_IP_NF_QUEUE=m
40CONFIG_LLC2=m 35CONFIG_LLC2=m
41CONFIG_NET_PKTGEN=m 36CONFIG_NET_PKTGEN=m
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 37CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -65,21 +60,20 @@ CONFIG_MD_LINEAR=m
65CONFIG_MD_RAID0=m 60CONFIG_MD_RAID0=m
66CONFIG_MD_RAID1=m 61CONFIG_MD_RAID1=m
67CONFIG_NETDEVICES=y 62CONFIG_NETDEVICES=y
68CONFIG_DUMMY=m
69CONFIG_BONDING=m 63CONFIG_BONDING=m
64CONFIG_DUMMY=m
70CONFIG_TUN=m 65CONFIG_TUN=m
71CONFIG_NET_ETHERNET=y
72CONFIG_MII=m
73CONFIG_LASI_82596=y 66CONFIG_LASI_82596=y
74CONFIG_PPP=m 67CONFIG_PPP=m
75CONFIG_PPP_ASYNC=m
76CONFIG_PPP_SYNC_TTY=m
77CONFIG_PPP_DEFLATE=m
78CONFIG_PPP_BSDCOMP=m 68CONFIG_PPP_BSDCOMP=m
69CONFIG_PPP_DEFLATE=m
79CONFIG_PPP_MPPE=m 70CONFIG_PPP_MPPE=m
80CONFIG_PPPOE=m 71CONFIG_PPPOE=m
72CONFIG_PPP_ASYNC=m
73CONFIG_PPP_SYNC_TTY=m
81# CONFIG_KEYBOARD_HIL_OLD is not set 74# CONFIG_KEYBOARD_HIL_OLD is not set
82CONFIG_MOUSE_SERIAL=m 75CONFIG_MOUSE_SERIAL=m
76CONFIG_LEGACY_PTY_COUNT=64
83CONFIG_SERIAL_8250=y 77CONFIG_SERIAL_8250=y
84CONFIG_SERIAL_8250_CONSOLE=y 78CONFIG_SERIAL_8250_CONSOLE=y
85CONFIG_SERIAL_8250_NR_UARTS=17 79CONFIG_SERIAL_8250_NR_UARTS=17
@@ -88,22 +82,17 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
88CONFIG_SERIAL_8250_SHARE_IRQ=y 82CONFIG_SERIAL_8250_SHARE_IRQ=y
89# CONFIG_SERIAL_MUX is not set 83# CONFIG_SERIAL_MUX is not set
90CONFIG_PDC_CONSOLE=y 84CONFIG_PDC_CONSOLE=y
91CONFIG_LEGACY_PTY_COUNT=64
92CONFIG_PRINTER=m 85CONFIG_PRINTER=m
93CONFIG_PPDEV=m 86CONFIG_PPDEV=m
94# CONFIG_HW_RANDOM is not set 87# CONFIG_HW_RANDOM is not set
95CONFIG_RAW_DRIVER=y 88CONFIG_RAW_DRIVER=y
96# CONFIG_HWMON is not set 89# CONFIG_HWMON is not set
97CONFIG_VIDEO_OUTPUT_CONTROL=m
98CONFIG_FB=y 90CONFIG_FB=y
99CONFIG_FB_MODE_HELPERS=y 91CONFIG_FB_MODE_HELPERS=y
100CONFIG_FB_TILEBLITTING=y 92CONFIG_FB_TILEBLITTING=y
101CONFIG_DUMMY_CONSOLE_COLUMNS=128 93CONFIG_DUMMY_CONSOLE_COLUMNS=128
102CONFIG_DUMMY_CONSOLE_ROWS=48 94CONFIG_DUMMY_CONSOLE_ROWS=48
103CONFIG_FRAMEBUFFER_CONSOLE=y 95CONFIG_FRAMEBUFFER_CONSOLE=y
104CONFIG_FONTS=y
105CONFIG_FONT_8x8=y
106CONFIG_FONT_8x16=y
107CONFIG_LOGO=y 96CONFIG_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
111CONFIG_SOUND=y 100CONFIG_SOUND=y
112CONFIG_SND=y 101CONFIG_SND=y
113CONFIG_SND_SEQUENCER=y 102CONFIG_SND_SEQUENCER=y
114CONFIG_SND_MIXER_OSS=y
115CONFIG_SND_PCM_OSS=y
116CONFIG_SND_SEQUENCER_OSS=y
117CONFIG_SND_HARMONY=y 103CONFIG_SND_HARMONY=y
118CONFIG_EXT2_FS=y 104CONFIG_EXT2_FS=y
119CONFIG_EXT3_FS=y 105CONFIG_EXT3_FS=y
120# CONFIG_EXT3_FS_XATTR is not set
121CONFIG_JFS_FS=m 106CONFIG_JFS_FS=m
122CONFIG_XFS_FS=m 107CONFIG_XFS_FS=m
123CONFIG_AUTOFS4_FS=y 108CONFIG_AUTOFS4_FS=y
@@ -130,14 +115,10 @@ CONFIG_PROC_KCORE=y
130CONFIG_TMPFS=y 115CONFIG_TMPFS=y
131CONFIG_UFS_FS=m 116CONFIG_UFS_FS=m
132CONFIG_NFS_FS=y 117CONFIG_NFS_FS=y
133CONFIG_NFS_V3=y
134CONFIG_NFS_V4=y 118CONFIG_NFS_V4=y
135CONFIG_ROOT_NFS=y 119CONFIG_ROOT_NFS=y
136CONFIG_NFSD=m 120CONFIG_NFSD=m
137CONFIG_NFSD_V4=y 121CONFIG_NFSD_V4=y
138CONFIG_RPCSEC_GSS_SPKM3=m
139CONFIG_SMB_FS=m
140CONFIG_SMB_NLS_DEFAULT=y
141CONFIG_CIFS=m 122CONFIG_CIFS=m
142CONFIG_NLS_CODEPAGE_437=m 123CONFIG_NLS_CODEPAGE_437=m
143CONFIG_NLS_CODEPAGE_737=m 124CONFIG_NLS_CODEPAGE_737=m
@@ -177,21 +158,16 @@ CONFIG_NLS_ISO8859_15=m
177CONFIG_NLS_KOI8_R=m 158CONFIG_NLS_KOI8_R=m
178CONFIG_NLS_KOI8_U=m 159CONFIG_NLS_KOI8_U=m
179CONFIG_NLS_UTF8=m 160CONFIG_NLS_UTF8=m
180CONFIG_MAGIC_SYSRQ=y
181CONFIG_DEBUG_FS=y 161CONFIG_DEBUG_FS=y
162CONFIG_MAGIC_SYSRQ=y
182CONFIG_DEBUG_KERNEL=y 163CONFIG_DEBUG_KERNEL=y
183CONFIG_DEBUG_MUTEXES=y 164CONFIG_DEBUG_MUTEXES=y
184# CONFIG_RCU_CPU_STALL_DETECTOR is not set
185CONFIG_CRYPTO_NULL=m
186CONFIG_CRYPTO_TEST=m 165CONFIG_CRYPTO_TEST=m
187CONFIG_CRYPTO_HMAC=y 166CONFIG_CRYPTO_HMAC=y
188CONFIG_CRYPTO_MD4=m
189CONFIG_CRYPTO_MICHAEL_MIC=m 167CONFIG_CRYPTO_MICHAEL_MIC=m
190CONFIG_CRYPTO_SHA256=m
191CONFIG_CRYPTO_SHA512=m 168CONFIG_CRYPTO_SHA512=m
192CONFIG_CRYPTO_TGR192=m 169CONFIG_CRYPTO_TGR192=m
193CONFIG_CRYPTO_WP512=m 170CONFIG_CRYPTO_WP512=m
194CONFIG_CRYPTO_AES=m
195CONFIG_CRYPTO_ANUBIS=m 171CONFIG_CRYPTO_ANUBIS=m
196CONFIG_CRYPTO_BLOWFISH=m 172CONFIG_CRYPTO_BLOWFISH=m
197CONFIG_CRYPTO_CAST6=m 173CONFIG_CRYPTO_CAST6=m
@@ -200,6 +176,7 @@ CONFIG_CRYPTO_SERPENT=m
200CONFIG_CRYPTO_TEA=m 176CONFIG_CRYPTO_TEA=m
201CONFIG_CRYPTO_TWOFISH=m 177CONFIG_CRYPTO_TWOFISH=m
202CONFIG_CRYPTO_DEFLATE=m 178CONFIG_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
205CONFIG_LIBCRC32C=m 180CONFIG_FONTS=y
181CONFIG_FONT_8x8=y
182CONFIG_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 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
8CONFIG_SYSFS_DEPRECATED_V2=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_EXPERT=y 8CONFIG_EXPERT=y
12CONFIG_KALLSYMS_ALL=y 9CONFIG_KALLSYMS_ALL=y
13CONFIG_SLAB=y 10CONFIG_SLAB=y
@@ -16,7 +13,6 @@ CONFIG_OPROFILE=m
16CONFIG_MODULES=y 13CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 14CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y 15CONFIG_MODULE_FORCE_UNLOAD=y
19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_PA8X00=y 16CONFIG_PA8X00=y
21CONFIG_64BIT=y 17CONFIG_64BIT=y
22CONFIG_SMP=y 18CONFIG_SMP=y
@@ -43,21 +39,17 @@ CONFIG_IP_PNP_DHCP=y
43CONFIG_IP_PNP_BOOTP=y 39CONFIG_IP_PNP_BOOTP=y
44CONFIG_INET_AH=m 40CONFIG_INET_AH=m
45CONFIG_INET_ESP=m 41CONFIG_INET_ESP=m
46# CONFIG_INET_LRO is not set
47CONFIG_INET6_AH=m 42CONFIG_INET6_AH=m
48CONFIG_INET6_ESP=m 43CONFIG_INET6_ESP=m
49CONFIG_INET6_IPCOMP=m 44CONFIG_INET6_IPCOMP=m
50CONFIG_IPV6_TUNNEL=m 45CONFIG_IPV6_TUNNEL=m
51CONFIG_NETFILTER=y 46CONFIG_NETFILTER=y
52# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 47# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
53CONFIG_IP_NF_QUEUE=m
54CONFIG_IP_NF_IPTABLES=m 48CONFIG_IP_NF_IPTABLES=m
55CONFIG_IP_NF_MATCH_ECN=m 49CONFIG_IP_NF_MATCH_ECN=m
56CONFIG_IP_NF_MATCH_TTL=m 50CONFIG_IP_NF_MATCH_TTL=m
57CONFIG_IP_NF_FILTER=m 51CONFIG_IP_NF_FILTER=m
58CONFIG_IP_NF_TARGET_REJECT=m 52CONFIG_IP_NF_TARGET_REJECT=m
59CONFIG_IP_NF_TARGET_LOG=m
60CONFIG_IP_NF_TARGET_ULOG=m
61CONFIG_IP_NF_MANGLE=m 53CONFIG_IP_NF_MANGLE=m
62CONFIG_IP_NF_TARGET_ECN=m 54CONFIG_IP_NF_TARGET_ECN=m
63CONFIG_IP_NF_RAW=m 55CONFIG_IP_NF_RAW=m
@@ -70,7 +62,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
70CONFIG_IP6_NF_MATCH_HL=m 62CONFIG_IP6_NF_MATCH_HL=m
71CONFIG_IP6_NF_MATCH_IPV6HEADER=m 63CONFIG_IP6_NF_MATCH_IPV6HEADER=m
72CONFIG_IP6_NF_MATCH_RT=m 64CONFIG_IP6_NF_MATCH_RT=m
73CONFIG_IP6_NF_TARGET_LOG=m
74CONFIG_IP6_NF_FILTER=m 65CONFIG_IP6_NF_FILTER=m
75CONFIG_IP6_NF_TARGET_REJECT=m 66CONFIG_IP6_NF_TARGET_REJECT=m
76CONFIG_IP6_NF_MANGLE=m 67CONFIG_IP6_NF_MANGLE=m
@@ -94,7 +85,6 @@ CONFIG_BLK_DEV_SD=y
94CONFIG_CHR_DEV_ST=y 85CONFIG_CHR_DEV_ST=y
95CONFIG_BLK_DEV_SR=y 86CONFIG_BLK_DEV_SR=y
96CONFIG_CHR_DEV_SG=y 87CONFIG_CHR_DEV_SG=y
97CONFIG_SCSI_MULTI_LUN=y
98CONFIG_SCSI_ISCSI_ATTRS=m 88CONFIG_SCSI_ISCSI_ATTRS=m
99CONFIG_SCSI_SYM53C8XX_2=y 89CONFIG_SCSI_SYM53C8XX_2=y
100CONFIG_SCSI_QLOGIC_1280=m 90CONFIG_SCSI_QLOGIC_1280=m
@@ -106,43 +96,38 @@ CONFIG_MD_RAID0=y
106CONFIG_MD_RAID1=y 96CONFIG_MD_RAID1=y
107CONFIG_FUSION=y 97CONFIG_FUSION=y
108CONFIG_FUSION_SPI=m 98CONFIG_FUSION_SPI=m
109CONFIG_FUSION_FC=m
110CONFIG_FUSION_CTL=m 99CONFIG_FUSION_CTL=m
111CONFIG_NETDEVICES=y 100CONFIG_NETDEVICES=y
112CONFIG_DUMMY=m
113CONFIG_BONDING=m 101CONFIG_BONDING=m
102CONFIG_DUMMY=m
114CONFIG_TUN=m 103CONFIG_TUN=m
115CONFIG_NET_ETHERNET=y 104CONFIG_PCMCIA_3C574=m
116CONFIG_NET_VENDOR_3COM=y 105CONFIG_PCMCIA_3C589=m
117CONFIG_VORTEX=m 106CONFIG_VORTEX=m
118CONFIG_TYPHOON=m 107CONFIG_TYPHOON=m
108CONFIG_ACENIC=m
109CONFIG_ACENIC_OMIT_TIGON_I=y
110CONFIG_PCNET32=m
111CONFIG_TIGON3=m
119CONFIG_NET_TULIP=y 112CONFIG_NET_TULIP=y
120CONFIG_DE2104X=m 113CONFIG_DE2104X=m
121CONFIG_TULIP=y 114CONFIG_TULIP=y
122CONFIG_TULIP_MMIO=y 115CONFIG_TULIP_MMIO=y
123CONFIG_PCMCIA_XIRCOM=m 116CONFIG_PCMCIA_XIRCOM=m
124CONFIG_HP100=m 117CONFIG_HP100=m
125CONFIG_NET_PCI=y
126CONFIG_PCNET32=m
127CONFIG_E100=m 118CONFIG_E100=m
128CONFIG_ACENIC=m
129CONFIG_ACENIC_OMIT_TIGON_I=y
130CONFIG_E1000=m 119CONFIG_E1000=m
131CONFIG_TIGON3=m
132CONFIG_NET_PCMCIA=y
133CONFIG_PCMCIA_3C589=m
134CONFIG_PCMCIA_3C574=m
135CONFIG_PCMCIA_SMC91C92=m 120CONFIG_PCMCIA_SMC91C92=m
136CONFIG_PCMCIA_XIRC2PS=m 121CONFIG_PCMCIA_XIRC2PS=m
137CONFIG_PPP=m 122CONFIG_PPP=m
123CONFIG_PPP_BSDCOMP=m
124CONFIG_PPP_DEFLATE=m
138CONFIG_PPP_ASYNC=m 125CONFIG_PPP_ASYNC=m
139CONFIG_PPP_SYNC_TTY=m 126CONFIG_PPP_SYNC_TTY=m
140CONFIG_PPP_DEFLATE=m
141CONFIG_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
146CONFIG_SERIAL_8250=y 131CONFIG_SERIAL_8250=y
147CONFIG_SERIAL_8250_CONSOLE=y 132CONFIG_SERIAL_8250_CONSOLE=y
148CONFIG_SERIAL_8250_CS=m 133CONFIG_SERIAL_8250_CS=m
@@ -151,7 +136,6 @@ CONFIG_SERIAL_8250_EXTENDED=y
151CONFIG_SERIAL_8250_MANY_PORTS=y 136CONFIG_SERIAL_8250_MANY_PORTS=y
152CONFIG_SERIAL_8250_SHARE_IRQ=y 137CONFIG_SERIAL_8250_SHARE_IRQ=y
153CONFIG_PDC_CONSOLE=y 138CONFIG_PDC_CONSOLE=y
154# CONFIG_LEGACY_PTYS is not set
155# CONFIG_HW_RANDOM is not set 139# CONFIG_HW_RANDOM is not set
156CONFIG_RAW_DRIVER=y 140CONFIG_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
161CONFIG_EXT2_FS=y 145CONFIG_EXT2_FS=y
162CONFIG_EXT3_FS=y 146CONFIG_EXT3_FS=y
163# CONFIG_EXT3_FS_XATTR is not set
164CONFIG_JFS_FS=m 147CONFIG_JFS_FS=m
165CONFIG_XFS_FS=m 148CONFIG_XFS_FS=m
166CONFIG_AUTOFS4_FS=y 149CONFIG_AUTOFS4_FS=y
@@ -173,13 +156,9 @@ CONFIG_PROC_KCORE=y
173CONFIG_TMPFS=y 156CONFIG_TMPFS=y
174CONFIG_UFS_FS=m 157CONFIG_UFS_FS=m
175CONFIG_NFS_FS=m 158CONFIG_NFS_FS=m
176CONFIG_NFS_V3=y 159CONFIG_NFS_V4=m
177CONFIG_NFS_V4=y
178CONFIG_NFSD=m 160CONFIG_NFSD=m
179CONFIG_NFSD_V4=y 161CONFIG_NFSD_V4=y
180CONFIG_RPCSEC_GSS_SPKM3=m
181CONFIG_SMB_FS=m
182CONFIG_SMB_NLS_DEFAULT=y
183CONFIG_CIFS=m 162CONFIG_CIFS=m
184CONFIG_NLS_CODEPAGE_437=m 163CONFIG_NLS_CODEPAGE_437=m
185CONFIG_NLS_CODEPAGE_850=m 164CONFIG_NLS_CODEPAGE_850=m
@@ -187,17 +166,12 @@ CONFIG_NLS_ASCII=m
187CONFIG_NLS_ISO8859_1=m 166CONFIG_NLS_ISO8859_1=m
188CONFIG_NLS_ISO8859_15=m 167CONFIG_NLS_ISO8859_15=m
189CONFIG_NLS_UTF8=m 168CONFIG_NLS_UTF8=m
190CONFIG_MAGIC_SYSRQ=y
191CONFIG_DEBUG_FS=y 169CONFIG_DEBUG_FS=y
192CONFIG_HEADERS_CHECK=y 170CONFIG_HEADERS_CHECK=y
193CONFIG_DEBUG_KERNEL=y 171CONFIG_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
196CONFIG_CRYPTO_NULL=m
197CONFIG_CRYPTO_TEST=m 173CONFIG_CRYPTO_TEST=m
198CONFIG_CRYPTO_HMAC=y 174CONFIG_CRYPTO_HMAC=y
199CONFIG_CRYPTO_MD5=y 175CONFIG_CRYPTO_MD5=y
200CONFIG_CRYPTO_BLOWFISH=m 176CONFIG_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
203CONFIG_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
3CONFIG_IKCONFIG=y 3CONFIG_IKCONFIG=y
4CONFIG_IKCONFIG_PROC=y 4CONFIG_IKCONFIG_PROC=y
5CONFIG_LOG_BUF_SHIFT=16 5CONFIG_LOG_BUF_SHIFT=16
6CONFIG_SYSFS_DEPRECATED_V2=y
7CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
8CONFIG_SLAB=y 7CONFIG_SLAB=y
9CONFIG_MODULES=y 8CONFIG_MODULES=y
@@ -25,8 +24,6 @@ CONFIG_INET=y
25CONFIG_IP_MULTICAST=y 24CONFIG_IP_MULTICAST=y
26CONFIG_IP_PNP=y 25CONFIG_IP_PNP=y
27CONFIG_IP_PNP_BOOTP=y 26CONFIG_IP_PNP_BOOTP=y
28# CONFIG_INET_LRO is not set
29CONFIG_IPV6=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31CONFIG_DEVTMPFS=y 28CONFIG_DEVTMPFS=y
32CONFIG_DEVTMPFS_MOUNT=y 29CONFIG_DEVTMPFS_MOUNT=y
@@ -53,10 +50,9 @@ CONFIG_MD_LINEAR=y
53CONFIG_MD_RAID0=y 50CONFIG_MD_RAID0=y
54CONFIG_MD_RAID1=y 51CONFIG_MD_RAID1=y
55CONFIG_NETDEVICES=y 52CONFIG_NETDEVICES=y
56CONFIG_NET_ETHERNET=y
57CONFIG_LASI_82596=y
58CONFIG_NET_TULIP=y 53CONFIG_NET_TULIP=y
59CONFIG_TULIP=y 54CONFIG_TULIP=y
55CONFIG_LASI_82596=y
60CONFIG_PPP=y 56CONFIG_PPP=y
61CONFIG_INPUT_EVDEV=y 57CONFIG_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
71CONFIG_PRINTER=y 67CONFIG_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
74CONFIG_VIDEO_OUTPUT_CONTROL=m
75CONFIG_FB=y 70CONFIG_FB=y
76CONFIG_FRAMEBUFFER_CONSOLE=y 71CONFIG_FRAMEBUFFER_CONSOLE=y
77CONFIG_LOGO=y 72CONFIG_LOGO=y
78CONFIG_SOUND=y 73CONFIG_SOUND=y
79CONFIG_SND=y 74CONFIG_SND=y
80CONFIG_SND_SEQUENCER=y 75CONFIG_SND_SEQUENCER=y
81CONFIG_SND_MIXER_OSS=y
82CONFIG_SND_PCM_OSS=y
83CONFIG_SND_SEQUENCER_OSS=y
84CONFIG_SND_HARMONY=y 76CONFIG_SND_HARMONY=y
85CONFIG_EXT2_FS=y 77CONFIG_EXT2_FS=y
86CONFIG_EXT3_FS=y 78CONFIG_EXT3_FS=y
87# CONFIG_EXT3_FS_XATTR is not set
88CONFIG_AUTOFS4_FS=y 79CONFIG_AUTOFS4_FS=y
89CONFIG_ISO9660_FS=y 80CONFIG_ISO9660_FS=y
90CONFIG_JOLIET=y 81CONFIG_JOLIET=y
91CONFIG_PROC_KCORE=y 82CONFIG_PROC_KCORE=y
92CONFIG_TMPFS=y 83CONFIG_TMPFS=y
93CONFIG_NFS_FS=y 84CONFIG_NFS_FS=y
94CONFIG_NFS_V3=y
95CONFIG_ROOT_NFS=y 85CONFIG_ROOT_NFS=y
96CONFIG_NFSD=y 86CONFIG_NFSD=y
97CONFIG_NFSD_V3=y 87CONFIG_NFSD_V3=y
98CONFIG_SMB_FS=y
99CONFIG_NLS_CODEPAGE_437=m 88CONFIG_NLS_CODEPAGE_437=m
100CONFIG_NLS_CODEPAGE_850=m 89CONFIG_NLS_CODEPAGE_850=m
101CONFIG_NLS_ASCII=m 90CONFIG_NLS_ASCII=m
102CONFIG_NLS_ISO8859_1=m 91CONFIG_NLS_ISO8859_1=m
103CONFIG_NLS_ISO8859_15=m 92CONFIG_NLS_ISO8859_15=m
104CONFIG_NLS_UTF8=m 93CONFIG_NLS_UTF8=m
105CONFIG_MAGIC_SYSRQ=y
106CONFIG_HEADERS_CHECK=y 94CONFIG_HEADERS_CHECK=y
95CONFIG_MAGIC_SYSRQ=y
107CONFIG_DEBUG_KERNEL=y 96CONFIG_DEBUG_KERNEL=y
108# CONFIG_RCU_CPU_STALL_DETECTOR is not set
109CONFIG_SECURITY=y 97CONFIG_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 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_IKCONFIG=y 3CONFIG_IKCONFIG=y
5CONFIG_IKCONFIG_PROC=y 4CONFIG_IKCONFIG_PROC=y
6CONFIG_LOG_BUF_SHIFT=16 5CONFIG_LOG_BUF_SHIFT=16
7CONFIG_SYSFS_DEPRECATED_V2=y
8CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
9# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
10CONFIG_EXPERT=y 7CONFIG_EXPERT=y
11CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
12CONFIG_SLAB=y 9CONFIG_SLAB=y
@@ -15,7 +12,6 @@ CONFIG_OPROFILE=m
15CONFIG_MODULES=y 12CONFIG_MODULES=y
16CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
17CONFIG_MODULE_FORCE_UNLOAD=y 14CONFIG_MODULE_FORCE_UNLOAD=y
18# CONFIG_BLK_DEV_BSG is not set
19CONFIG_PA8X00=y 15CONFIG_PA8X00=y
20CONFIG_PREEMPT_VOLUNTARY=y 16CONFIG_PREEMPT_VOLUNTARY=y
21# CONFIG_GSC is not set 17# CONFIG_GSC is not set
@@ -31,13 +27,11 @@ CONFIG_INET=y
31CONFIG_IP_MULTICAST=y 27CONFIG_IP_MULTICAST=y
32CONFIG_IP_PNP=y 28CONFIG_IP_PNP=y
33CONFIG_IP_PNP_BOOTP=y 29CONFIG_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
36CONFIG_INET6_IPCOMP=m 31CONFIG_INET6_IPCOMP=m
37CONFIG_IPV6_TUNNEL=m 32CONFIG_IPV6_TUNNEL=m
38CONFIG_NETFILTER=y 33CONFIG_NETFILTER=y
39CONFIG_NETFILTER_DEBUG=y 34CONFIG_NETFILTER_DEBUG=y
40CONFIG_IP_NF_QUEUE=m
41CONFIG_NET_PKTGEN=m 35CONFIG_NET_PKTGEN=m
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 36CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43CONFIG_DEVTMPFS=y 37CONFIG_DEVTMPFS=y
@@ -50,13 +44,11 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
50CONFIG_IDE=y 44CONFIG_IDE=y
51CONFIG_BLK_DEV_IDECD=y 45CONFIG_BLK_DEV_IDECD=y
52CONFIG_BLK_DEV_NS87415=y 46CONFIG_BLK_DEV_NS87415=y
53CONFIG_PATA_SIL680=m
54CONFIG_SCSI=y 47CONFIG_SCSI=y
55CONFIG_BLK_DEV_SD=y 48CONFIG_BLK_DEV_SD=y
56CONFIG_CHR_DEV_ST=y 49CONFIG_CHR_DEV_ST=y
57CONFIG_BLK_DEV_SR=y 50CONFIG_BLK_DEV_SR=y
58CONFIG_CHR_DEV_SG=y 51CONFIG_CHR_DEV_SG=y
59CONFIG_SCSI_MULTI_LUN=y
60CONFIG_SCSI_ISCSI_ATTRS=m 52CONFIG_SCSI_ISCSI_ATTRS=m
61CONFIG_SCSI_SYM53C8XX_2=y 53CONFIG_SCSI_SYM53C8XX_2=y
62CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 54CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
@@ -76,28 +68,23 @@ CONFIG_FUSION=y
76CONFIG_FUSION_SPI=m 68CONFIG_FUSION_SPI=m
77CONFIG_FUSION_CTL=m 69CONFIG_FUSION_CTL=m
78CONFIG_NETDEVICES=y 70CONFIG_NETDEVICES=y
79CONFIG_DUMMY=m
80CONFIG_BONDING=m 71CONFIG_BONDING=m
72CONFIG_DUMMY=m
81CONFIG_TUN=m 73CONFIG_TUN=m
82CONFIG_NET_ETHERNET=y 74CONFIG_ACENIC=m
75CONFIG_TIGON3=m
83CONFIG_NET_TULIP=y 76CONFIG_NET_TULIP=y
84CONFIG_DE2104X=m 77CONFIG_DE2104X=m
85CONFIG_TULIP=y 78CONFIG_TULIP=y
86CONFIG_TULIP_MMIO=y 79CONFIG_TULIP_MMIO=y
87CONFIG_NET_PCI=y
88CONFIG_E100=m 80CONFIG_E100=m
89CONFIG_ACENIC=m
90CONFIG_E1000=m 81CONFIG_E1000=m
91CONFIG_TIGON3=m
92CONFIG_PPP=m 82CONFIG_PPP=m
93CONFIG_PPP_ASYNC=m
94CONFIG_PPP_SYNC_TTY=m
95CONFIG_PPP_DEFLATE=m
96CONFIG_PPP_BSDCOMP=m 83CONFIG_PPP_BSDCOMP=m
84CONFIG_PPP_DEFLATE=m
97CONFIG_PPPOE=m 85CONFIG_PPPOE=m
98# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 86CONFIG_PPP_ASYNC=m
99CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600 87CONFIG_PPP_SYNC_TTY=m
100CONFIG_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
103CONFIG_SERIO=m 90CONFIG_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
112CONFIG_RAW_DRIVER=y 99CONFIG_RAW_DRIVER=y
113# CONFIG_HWMON is not set 100# CONFIG_HWMON is not set
114CONFIG_VIDEO_OUTPUT_CONTROL=m
115CONFIG_FB=y 101CONFIG_FB=y
116CONFIG_FRAMEBUFFER_CONSOLE=y 102CONFIG_FRAMEBUFFER_CONSOLE=y
117CONFIG_LOGO=y 103CONFIG_LOGO=y
@@ -121,9 +107,6 @@ CONFIG_LOGO=y
121CONFIG_SOUND=y 107CONFIG_SOUND=y
122CONFIG_SND=y 108CONFIG_SND=y
123CONFIG_SND_SEQUENCER=y 109CONFIG_SND_SEQUENCER=y
124CONFIG_SND_MIXER_OSS=y
125CONFIG_SND_PCM_OSS=y
126CONFIG_SND_SEQUENCER_OSS=y
127CONFIG_SND_AD1889=y 110CONFIG_SND_AD1889=y
128CONFIG_USB_HIDDEV=y 111CONFIG_USB_HIDDEV=y
129CONFIG_USB=y 112CONFIG_USB=y
@@ -139,7 +122,6 @@ CONFIG_USB_MICROTEK=m
139CONFIG_USB_LEGOTOWER=m 122CONFIG_USB_LEGOTOWER=m
140CONFIG_EXT2_FS=y 123CONFIG_EXT2_FS=y
141CONFIG_EXT3_FS=y 124CONFIG_EXT3_FS=y
142# CONFIG_EXT3_FS_XATTR is not set
143CONFIG_XFS_FS=m 125CONFIG_XFS_FS=m
144CONFIG_AUTOFS4_FS=y 126CONFIG_AUTOFS4_FS=y
145CONFIG_ISO9660_FS=y 127CONFIG_ISO9660_FS=y
@@ -149,7 +131,6 @@ CONFIG_VFAT_FS=m
149CONFIG_PROC_KCORE=y 131CONFIG_PROC_KCORE=y
150CONFIG_TMPFS=y 132CONFIG_TMPFS=y
151CONFIG_NFS_FS=y 133CONFIG_NFS_FS=y
152CONFIG_NFS_V3=y
153CONFIG_ROOT_NFS=y 134CONFIG_ROOT_NFS=y
154CONFIG_NFSD=y 135CONFIG_NFSD=y
155CONFIG_NFSD_V3=y 136CONFIG_NFSD_V3=y
@@ -159,18 +140,13 @@ CONFIG_NLS_ASCII=m
159CONFIG_NLS_ISO8859_1=m 140CONFIG_NLS_ISO8859_1=m
160CONFIG_NLS_ISO8859_15=m 141CONFIG_NLS_ISO8859_15=m
161CONFIG_NLS_UTF8=m 142CONFIG_NLS_UTF8=m
162CONFIG_MAGIC_SYSRQ=y
163CONFIG_DEBUG_FS=y 143CONFIG_DEBUG_FS=y
164CONFIG_HEADERS_CHECK=y 144CONFIG_HEADERS_CHECK=y
165CONFIG_DEBUG_KERNEL=y 145CONFIG_MAGIC_SYSRQ=y
166CONFIG_DEBUG_MUTEXES=y 146CONFIG_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
169CONFIG_CRYPTO_NULL=m
170CONFIG_CRYPTO_TEST=m 148CONFIG_CRYPTO_TEST=m
171CONFIG_CRYPTO_MD5=m 149CONFIG_CRYPTO_MD5=m
172CONFIG_CRYPTO_BLOWFISH=m 150CONFIG_CRYPTO_BLOWFISH=m
173CONFIG_CRYPTO_DES=m 151CONFIG_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
176CONFIG_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
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y 4# CONFIG_CROSS_MEMORY_ATTACH is not set
5CONFIG_BSD_PROCESS_ACCT=y 5CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 6CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_IKCONFIG=y 7CONFIG_IKCONFIG=y
8CONFIG_IKCONFIG_PROC=y 8CONFIG_IKCONFIG_PROC=y
9CONFIG_RELAY=y 9CONFIG_RELAY=y
10CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
11CONFIG_RD_BZIP2=y
12CONFIG_RD_LZMA=y
13CONFIG_RD_LZO=y
14CONFIG_EXPERT=y 11CONFIG_EXPERT=y
15CONFIG_SYSCTL_SYSCALL=y 12CONFIG_SYSCTL_SYSCALL=y
16CONFIG_SLAB=y 13CONFIG_SLAB=y
@@ -23,7 +20,6 @@ CONFIG_PA8X00=y
23CONFIG_64BIT=y 20CONFIG_64BIT=y
24CONFIG_SMP=y 21CONFIG_SMP=y
25CONFIG_PREEMPT=y 22CONFIG_PREEMPT=y
26# CONFIG_CROSS_MEMORY_ATTACH is not set
27CONFIG_IOMMU_CCIO=y 23CONFIG_IOMMU_CCIO=y
28CONFIG_PCI=y 24CONFIG_PCI=y
29CONFIG_PCI_LBA=y 25CONFIG_PCI_LBA=y
@@ -146,7 +142,6 @@ CONFIG_FB_FOREIGN_ENDIAN=y
146CONFIG_FB_MODE_HELPERS=y 142CONFIG_FB_MODE_HELPERS=y
147CONFIG_FB_TILEBLITTING=y 143CONFIG_FB_TILEBLITTING=y
148# CONFIG_FB_STI is not set 144# CONFIG_FB_STI is not set
149CONFIG_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
152CONFIG_FRAMEBUFFER_CONSOLE=y 147CONFIG_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
158CONFIG_SOUND=m 153CONFIG_SOUND=m
159CONFIG_SND=m 154CONFIG_SND=m
155CONFIG_SND_VERBOSE_PRINTK=y
160CONFIG_SND_SEQUENCER=m 156CONFIG_SND_SEQUENCER=m
161CONFIG_SND_SEQ_DUMMY=m 157CONFIG_SND_SEQ_DUMMY=m
162CONFIG_SND_MIXER_OSS=m
163CONFIG_SND_PCM_OSS=m
164CONFIG_SND_SEQUENCER_OSS=y
165CONFIG_SND_VERBOSE_PRINTK=y
166CONFIG_SND_AD1889=m 158CONFIG_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
174CONFIG_EXT2_FS_POSIX_ACL=y 166CONFIG_EXT2_FS_POSIX_ACL=y
175CONFIG_EXT2_FS_SECURITY=y 167CONFIG_EXT2_FS_SECURITY=y
176CONFIG_EXT3_FS=y 168CONFIG_EXT3_FS=y
177# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
178CONFIG_EXT4_FS=m
179CONFIG_REISERFS_FS=m 169CONFIG_REISERFS_FS=m
180CONFIG_REISERFS_PROC_INFO=y 170CONFIG_REISERFS_PROC_INFO=y
181CONFIG_XFS_FS=m 171CONFIG_XFS_FS=m
@@ -238,11 +228,8 @@ CONFIG_DEBUG_SLAB=y
238CONFIG_DEBUG_SLAB_LEAK=y 228CONFIG_DEBUG_SLAB_LEAK=y
239CONFIG_DEBUG_MEMORY_INIT=y 229CONFIG_DEBUG_MEMORY_INIT=y
240CONFIG_DEBUG_STACKOVERFLOW=y 230CONFIG_DEBUG_STACKOVERFLOW=y
241CONFIG_LOCKUP_DETECTOR=y
242CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
243CONFIG_PANIC_ON_OOPS=y 231CONFIG_PANIC_ON_OOPS=y
244CONFIG_DEBUG_RT_MUTEXES=y 232CONFIG_DEBUG_RT_MUTEXES=y
245CONFIG_PROVE_RCU_DELAY=y
246CONFIG_DEBUG_BLOCK_EXT_DEVT=y 233CONFIG_DEBUG_BLOCK_EXT_DEVT=y
247CONFIG_LATENCYTOP=y 234CONFIG_LATENCYTOP=y
248CONFIG_KEYS=y 235CONFIG_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 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
8CONFIG_SYSFS_DEPRECATED_V2=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
11CONFIG_SLAB=y 9CONFIG_SLAB=y
@@ -41,9 +39,7 @@ CONFIG_IP_PNP_DHCP=y
41CONFIG_IP_PNP_BOOTP=y 39CONFIG_IP_PNP_BOOTP=y
42CONFIG_INET_AH=m 40CONFIG_INET_AH=m
43CONFIG_INET_ESP=m 41CONFIG_INET_ESP=m
44# CONFIG_INET_LRO is not set
45CONFIG_INET_DIAG=m 42CONFIG_INET_DIAG=m
46CONFIG_IPV6=y
47CONFIG_INET6_AH=y 43CONFIG_INET6_AH=y
48CONFIG_INET6_ESP=y 44CONFIG_INET6_ESP=y
49CONFIG_INET6_IPCOMP=y 45CONFIG_INET6_IPCOMP=y
@@ -82,26 +78,23 @@ CONFIG_MD_RAID1=y
82CONFIG_MD_RAID10=y 78CONFIG_MD_RAID10=y
83CONFIG_BLK_DEV_DM=y 79CONFIG_BLK_DEV_DM=y
84CONFIG_NETDEVICES=y 80CONFIG_NETDEVICES=y
85CONFIG_DUMMY=m
86CONFIG_BONDING=m 81CONFIG_BONDING=m
82CONFIG_DUMMY=m
87CONFIG_TUN=m 83CONFIG_TUN=m
88CONFIG_NET_ETHERNET=y
89CONFIG_MII=m
90CONFIG_LASI_82596=y
91CONFIG_NET_TULIP=y
92CONFIG_TULIP=y
93CONFIG_NET_PCI=y
94CONFIG_ACENIC=y 84CONFIG_ACENIC=y
95CONFIG_TIGON3=y 85CONFIG_TIGON3=y
96CONFIG_NET_PCMCIA=y 86CONFIG_NET_TULIP=y
87CONFIG_TULIP=y
88CONFIG_LASI_82596=y
97CONFIG_PPP=m 89CONFIG_PPP=m
98CONFIG_PPP_ASYNC=m
99CONFIG_PPP_SYNC_TTY=m
100CONFIG_PPP_DEFLATE=m
101CONFIG_PPP_BSDCOMP=m 90CONFIG_PPP_BSDCOMP=m
91CONFIG_PPP_DEFLATE=m
102CONFIG_PPPOE=m 92CONFIG_PPPOE=m
93CONFIG_PPP_ASYNC=m
94CONFIG_PPP_SYNC_TTY=m
103# CONFIG_KEYBOARD_HIL_OLD is not set 95# CONFIG_KEYBOARD_HIL_OLD is not set
104CONFIG_MOUSE_SERIAL=y 96CONFIG_MOUSE_SERIAL=y
97CONFIG_LEGACY_PTY_COUNT=64
105CONFIG_SERIAL_8250=y 98CONFIG_SERIAL_8250=y
106CONFIG_SERIAL_8250_CONSOLE=y 99CONFIG_SERIAL_8250_CONSOLE=y
107CONFIG_SERIAL_8250_CS=y 100CONFIG_SERIAL_8250_CS=y
@@ -109,31 +102,24 @@ CONFIG_SERIAL_8250_NR_UARTS=17
109CONFIG_SERIAL_8250_EXTENDED=y 102CONFIG_SERIAL_8250_EXTENDED=y
110CONFIG_SERIAL_8250_MANY_PORTS=y 103CONFIG_SERIAL_8250_MANY_PORTS=y
111CONFIG_SERIAL_8250_SHARE_IRQ=y 104CONFIG_SERIAL_8250_SHARE_IRQ=y
112CONFIG_LEGACY_PTY_COUNT=64
113CONFIG_PRINTER=m 105CONFIG_PRINTER=m
114CONFIG_PPDEV=m 106CONFIG_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
117CONFIG_VIDEO_OUTPUT_CONTROL=m
118CONFIG_FB=y 109CONFIG_FB=y
119CONFIG_FB_MODE_HELPERS=y 110CONFIG_FB_MODE_HELPERS=y
120CONFIG_FB_TILEBLITTING=y 111CONFIG_FB_TILEBLITTING=y
121CONFIG_DUMMY_CONSOLE_COLUMNS=128 112CONFIG_DUMMY_CONSOLE_COLUMNS=128
122CONFIG_DUMMY_CONSOLE_ROWS=48 113CONFIG_DUMMY_CONSOLE_ROWS=48
123CONFIG_FRAMEBUFFER_CONSOLE=y 114CONFIG_FRAMEBUFFER_CONSOLE=y
124CONFIG_FONTS=y
125CONFIG_FONT_8x16=y
126CONFIG_LOGO=y 115CONFIG_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
130CONFIG_SOUND=y 119CONFIG_SOUND=y
131CONFIG_SND=y 120CONFIG_SND=y
132CONFIG_SND_SEQUENCER=y
133CONFIG_SND_MIXER_OSS=y
134CONFIG_SND_PCM_OSS=y
135CONFIG_SND_SEQUENCER_OSS=y
136CONFIG_SND_DYNAMIC_MINORS=y 121CONFIG_SND_DYNAMIC_MINORS=y
122CONFIG_SND_SEQUENCER=y
137CONFIG_SND_AD1889=y 123CONFIG_SND_AD1889=y
138CONFIG_SND_HARMONY=y 124CONFIG_SND_HARMONY=y
139CONFIG_HID_GYRATION=y 125CONFIG_HID_GYRATION=y
@@ -141,7 +127,6 @@ CONFIG_HID_NTRIG=y
141CONFIG_HID_PANTHERLORD=y 127CONFIG_HID_PANTHERLORD=y
142CONFIG_HID_PETALYNX=y 128CONFIG_HID_PETALYNX=y
143CONFIG_HID_SAMSUNG=y 129CONFIG_HID_SAMSUNG=y
144CONFIG_HID_SONY=y
145CONFIG_HID_SUNPLUS=y 130CONFIG_HID_SUNPLUS=y
146CONFIG_HID_TOPSEED=y 131CONFIG_HID_TOPSEED=y
147CONFIG_USB=y 132CONFIG_USB=y
@@ -150,21 +135,15 @@ CONFIG_USB_OHCI_HCD=y
150CONFIG_USB_UHCI_HCD=y 135CONFIG_USB_UHCI_HCD=y
151CONFIG_EXT2_FS=y 136CONFIG_EXT2_FS=y
152CONFIG_EXT3_FS=y 137CONFIG_EXT3_FS=y
153# CONFIG_EXT3_FS_XATTR is not set
154CONFIG_AUTOFS_FS=y
155CONFIG_ISO9660_FS=y 138CONFIG_ISO9660_FS=y
156CONFIG_JOLIET=y 139CONFIG_JOLIET=y
157CONFIG_VFAT_FS=y 140CONFIG_VFAT_FS=y
158CONFIG_PROC_KCORE=y 141CONFIG_PROC_KCORE=y
159CONFIG_TMPFS=y 142CONFIG_TMPFS=y
160CONFIG_NFS_FS=y 143CONFIG_NFS_FS=y
161CONFIG_NFS_V3=y
162CONFIG_ROOT_NFS=y 144CONFIG_ROOT_NFS=y
163CONFIG_NFSD=y 145CONFIG_NFSD=y
164CONFIG_NFSD_V4=y 146CONFIG_NFSD_V4=y
165CONFIG_RPCSEC_GSS_SPKM3=m
166CONFIG_SMB_FS=m
167CONFIG_SMB_NLS_DEFAULT=y
168CONFIG_CIFS=m 147CONFIG_CIFS=m
169CONFIG_NLS_CODEPAGE_437=y 148CONFIG_NLS_CODEPAGE_437=y
170CONFIG_NLS_CODEPAGE_737=m 149CONFIG_NLS_CODEPAGE_737=m
@@ -204,30 +183,24 @@ CONFIG_NLS_ISO8859_15=m
204CONFIG_NLS_KOI8_R=m 183CONFIG_NLS_KOI8_R=m
205CONFIG_NLS_KOI8_U=m 184CONFIG_NLS_KOI8_U=m
206CONFIG_NLS_UTF8=y 185CONFIG_NLS_UTF8=y
207CONFIG_MAGIC_SYSRQ=y
208CONFIG_DEBUG_FS=y 186CONFIG_DEBUG_FS=y
209CONFIG_HEADERS_CHECK=y 187CONFIG_HEADERS_CHECK=y
188CONFIG_MAGIC_SYSRQ=y
210CONFIG_DEBUG_KERNEL=y 189CONFIG_DEBUG_KERNEL=y
211CONFIG_DEBUG_MUTEXES=y 190CONFIG_DEBUG_MUTEXES=y
212# CONFIG_RCU_CPU_STALL_DETECTOR is not set
213CONFIG_KEYS=y 191CONFIG_KEYS=y
214CONFIG_CRYPTO_NULL=m
215CONFIG_CRYPTO_TEST=m 192CONFIG_CRYPTO_TEST=m
216CONFIG_CRYPTO_MD4=m
217CONFIG_CRYPTO_MICHAEL_MIC=m 193CONFIG_CRYPTO_MICHAEL_MIC=m
218CONFIG_CRYPTO_SHA256=m
219CONFIG_CRYPTO_SHA512=m 194CONFIG_CRYPTO_SHA512=m
220CONFIG_CRYPTO_TGR192=m 195CONFIG_CRYPTO_TGR192=m
221CONFIG_CRYPTO_WP512=m 196CONFIG_CRYPTO_WP512=m
222CONFIG_CRYPTO_AES=m
223CONFIG_CRYPTO_ANUBIS=m 197CONFIG_CRYPTO_ANUBIS=m
224CONFIG_CRYPTO_ARC4=m
225CONFIG_CRYPTO_BLOWFISH=m 198CONFIG_CRYPTO_BLOWFISH=m
226CONFIG_CRYPTO_CAST6=m 199CONFIG_CRYPTO_CAST6=m
227CONFIG_CRYPTO_KHAZAD=m 200CONFIG_CRYPTO_KHAZAD=m
228CONFIG_CRYPTO_SERPENT=m 201CONFIG_CRYPTO_SERPENT=m
229CONFIG_CRYPTO_TEA=m 202CONFIG_CRYPTO_TEA=m
230CONFIG_CRYPTO_TWOFISH=m 203CONFIG_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
233CONFIG_LIBCRC32C=m 205CONFIG_LIBCRC32C=m
206CONFIG_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
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_FHANDLE=y
6CONFIG_BSD_PROCESS_ACCT=y 5CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_IKCONFIG=y 6CONFIG_IKCONFIG=y
8CONFIG_IKCONFIG_PROC=y 7CONFIG_IKCONFIG_PROC=y
9CONFIG_LOG_BUF_SHIFT=16 8CONFIG_LOG_BUF_SHIFT=16
10CONFIG_BLK_DEV_INITRD=y 9CONFIG_BLK_DEV_INITRD=y
11CONFIG_RD_BZIP2=y
12CONFIG_RD_LZMA=y
13CONFIG_RD_LZO=y
14CONFIG_EXPERT=y 10CONFIG_EXPERT=y
15CONFIG_SYSCTL_SYSCALL=y 11CONFIG_SYSCTL_SYSCALL=y
16CONFIG_PERF_EVENTS=y 12CONFIG_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
53CONFIG_INET_DIAG=m 48CONFIG_INET_DIAG=m
54CONFIG_LLC2=m 49CONFIG_LLC2=m
55# CONFIG_WIRELESS is not set 50# CONFIG_WIRELESS is not set
@@ -149,10 +144,8 @@ CONFIG_PRINTER=m
149CONFIG_PPDEV=m 144CONFIG_PPDEV=m
150# CONFIG_HW_RANDOM is not set 145# CONFIG_HW_RANDOM is not set
151CONFIG_I2C=y 146CONFIG_I2C=y
152CONFIG_POWER_SUPPLY=y
153# CONFIG_HWMON is not set 147# CONFIG_HWMON is not set
154CONFIG_AGP=y 148CONFIG_AGP=y
155CONFIG_VIDEO_OUTPUT_CONTROL=y
156CONFIG_FB=y 149CONFIG_FB=y
157CONFIG_FB_FOREIGN_ENDIAN=y 150CONFIG_FB_FOREIGN_ENDIAN=y
158CONFIG_FB_MODE_HELPERS=y 151CONFIG_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
170CONFIG_SOUND=m 163CONFIG_SOUND=m
171CONFIG_SND=m 164CONFIG_SND=m
172CONFIG_SND_SEQUENCER=m
173CONFIG_SND_MIXER_OSS=m
174CONFIG_SND_PCM_OSS=m
175CONFIG_SND_SEQUENCER_OSS=y
176CONFIG_SND_DYNAMIC_MINORS=y 165CONFIG_SND_DYNAMIC_MINORS=y
166CONFIG_SND_SEQUENCER=m
177CONFIG_SND_AD1889=m 167CONFIG_SND_AD1889=m
178CONFIG_SND_HARMONY=m 168CONFIG_SND_HARMONY=m
179CONFIG_HIDRAW=y 169CONFIG_HIDRAW=y
@@ -223,12 +213,7 @@ CONFIG_EXT2_FS=y
223CONFIG_EXT2_FS_XATTR=y 213CONFIG_EXT2_FS_XATTR=y
224CONFIG_EXT2_FS_SECURITY=y 214CONFIG_EXT2_FS_SECURITY=y
225CONFIG_EXT3_FS=y 215CONFIG_EXT3_FS=y
226# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
227CONFIG_EXT3_FS_SECURITY=y 216CONFIG_EXT3_FS_SECURITY=y
228CONFIG_EXT4_FS=y
229CONFIG_XFS_FS=m
230CONFIG_XFS_QUOTA=y
231CONFIG_XFS_RT=y
232CONFIG_QUOTA=y 217CONFIG_QUOTA=y
233CONFIG_QUOTA_NETLINK_INTERFACE=y 218CONFIG_QUOTA_NETLINK_INTERFACE=y
234CONFIG_QFMT_V2=y 219CONFIG_QFMT_V2=y
@@ -293,15 +278,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
293CONFIG_DEBUG_STACKOVERFLOW=y 278CONFIG_DEBUG_STACKOVERFLOW=y
294CONFIG_DEBUG_SHIRQ=y 279CONFIG_DEBUG_SHIRQ=y
295CONFIG_DETECT_HUNG_TASK=y 280CONFIG_DETECT_HUNG_TASK=y
296CONFIG_TIMER_STATS=y
297CONFIG_DEBUG_RT_MUTEXES=y 281CONFIG_DEBUG_RT_MUTEXES=y
298CONFIG_DEBUG_SPINLOCK=y 282CONFIG_DEBUG_SPINLOCK=y
299CONFIG_DEBUG_MUTEXES=y 283CONFIG_DEBUG_MUTEXES=y
300CONFIG_RCU_CPU_STALL_INFO=y
301CONFIG_LATENCYTOP=y 284CONFIG_LATENCYTOP=y
302CONFIG_LKDTM=m 285CONFIG_LKDTM=m
303CONFIG_KEYS=y 286CONFIG_KEYS=y
304CONFIG_CRYPTO_NULL=m
305CONFIG_CRYPTO_TEST=m 287CONFIG_CRYPTO_TEST=m
306CONFIG_CRYPTO_HMAC=y 288CONFIG_CRYPTO_HMAC=y
307CONFIG_CRYPTO_MD5=y 289CONFIG_CRYPTO_MD5=y
@@ -320,7 +302,6 @@ CONFIG_CRYPTO_SERPENT=m
320CONFIG_CRYPTO_TEA=m 302CONFIG_CRYPTO_TEA=m
321CONFIG_CRYPTO_TWOFISH=m 303CONFIG_CRYPTO_TWOFISH=m
322CONFIG_CRYPTO_DEFLATE=y 304CONFIG_CRYPTO_DEFLATE=y
323# CONFIG_CRYPTO_ANSI_CPRNG is not set
324CONFIG_CRC_CCITT=m 305CONFIG_CRC_CCITT=m
325CONFIG_CRC_T10DIF=y 306CONFIG_CRC_T10DIF=y
326CONFIG_FONTS=y 307CONFIG_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
8CONFIG_TASK_DELAY_ACCT=y 8CONFIG_TASK_DELAY_ACCT=y
9CONFIG_TASK_XACCT=y 9CONFIG_TASK_XACCT=y
10CONFIG_TASK_IO_ACCOUNTING=y 10CONFIG_TASK_IO_ACCOUNTING=y
11# CONFIG_UTS_NS is not set 11CONFIG_CGROUPS=y
12# CONFIG_IPC_NS is not set 12CONFIG_MEMCG=y
13# CONFIG_PID_NS is not set 13CONFIG_MEMCG_SWAP=y
14# CONFIG_NET_NS is not set 14CONFIG_CGROUP_PIDS=y
15CONFIG_CPUSETS=y
15CONFIG_RELAY=y 16CONFIG_RELAY=y
16CONFIG_BLK_DEV_INITRD=y 17CONFIG_BLK_DEV_INITRD=y
17CONFIG_CC_OPTIMIZE_FOR_SIZE=y 18CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -52,7 +53,6 @@ CONFIG_INET_ESP=m
52CONFIG_INET_XFRM_MODE_TRANSPORT=m 53CONFIG_INET_XFRM_MODE_TRANSPORT=m
53CONFIG_INET_XFRM_MODE_TUNNEL=m 54CONFIG_INET_XFRM_MODE_TUNNEL=m
54CONFIG_INET_XFRM_MODE_BEET=m 55CONFIG_INET_XFRM_MODE_BEET=m
55CONFIG_INET_LRO=m
56CONFIG_INET_DIAG=m 56CONFIG_INET_DIAG=m
57CONFIG_NETFILTER=y 57CONFIG_NETFILTER=y
58# CONFIG_NETFILTER_ADVANCED is not set 58# CONFIG_NETFILTER_ADVANCED is not set
@@ -84,7 +84,6 @@ CONFIG_PATA_SIL680=y
84CONFIG_ATA_GENERIC=y 84CONFIG_ATA_GENERIC=y
85CONFIG_MD=y 85CONFIG_MD=y
86CONFIG_MD_LINEAR=m 86CONFIG_MD_LINEAR=m
87CONFIG_MD_RAID0=m
88CONFIG_BLK_DEV_DM=m 87CONFIG_BLK_DEV_DM=m
89CONFIG_DM_RAID=m 88CONFIG_DM_RAID=m
90CONFIG_DM_UEVENT=y 89CONFIG_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
140CONFIG_MDIO_BITBANG=m
141CONFIG_PHYLIB=y 141CONFIG_PHYLIB=y
142CONFIG_MARVELL_PHY=m
143CONFIG_DAVICOM_PHY=m
144CONFIG_QSEMI_PHY=m
145CONFIG_LXT_PHY=m
146CONFIG_CICADA_PHY=m
147CONFIG_VITESSE_PHY=m
148CONFIG_SMSC_PHY=m
149CONFIG_BROADCOM_PHY=m 142CONFIG_BROADCOM_PHY=m
143CONFIG_CICADA_PHY=m
144CONFIG_DAVICOM_PHY=m
150CONFIG_ICPLUS_PHY=m 145CONFIG_ICPLUS_PHY=m
151CONFIG_REALTEK_PHY=m 146CONFIG_LSI_ET1011C_PHY=m
147CONFIG_LXT_PHY=m
148CONFIG_MARVELL_PHY=m
152CONFIG_NATIONAL_PHY=m 149CONFIG_NATIONAL_PHY=m
150CONFIG_QSEMI_PHY=m
151CONFIG_REALTEK_PHY=m
152CONFIG_SMSC_PHY=m
153CONFIG_STE10XP=m 153CONFIG_STE10XP=m
154CONFIG_LSI_ET1011C_PHY=m 154CONFIG_VITESSE_PHY=m
155CONFIG_MDIO_BITBANG=m
156CONFIG_SLIP=m 155CONFIG_SLIP=m
157CONFIG_SLIP_COMPRESSED=y 156CONFIG_SLIP_COMPRESSED=y
158CONFIG_SLIP_SMART=y 157CONFIG_SLIP_SMART=y
@@ -166,10 +165,8 @@ CONFIG_INPUT_MISC=y
166CONFIG_SERIO_SERPORT=m 165CONFIG_SERIO_SERPORT=m
167# CONFIG_HP_SDC is not set 166# CONFIG_HP_SDC is not set
168CONFIG_SERIO_RAW=m 167CONFIG_SERIO_RAW=m
169CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
170# CONFIG_LEGACY_PTYS is not set 168# CONFIG_LEGACY_PTYS is not set
171CONFIG_NOZOMI=m 169CONFIG_NOZOMI=m
172# CONFIG_DEVKMEM is not set
173CONFIG_SERIAL_8250=y 170CONFIG_SERIAL_8250=y
174# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set 171# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
175CONFIG_SERIAL_8250_CONSOLE=y 172CONFIG_SERIAL_8250_CONSOLE=y
@@ -207,10 +204,8 @@ CONFIG_AGP=y
207CONFIG_AGP_PARISC=y 204CONFIG_AGP_PARISC=y
208CONFIG_DRM=y 205CONFIG_DRM=y
209CONFIG_DRM_RADEON=y 206CONFIG_DRM_RADEON=y
210CONFIG_DRM_RADEON_UMS=y
211CONFIG_FIRMWARE_EDID=y 207CONFIG_FIRMWARE_EDID=y
212CONFIG_FB_MODE_HELPERS=y 208CONFIG_FB_MODE_HELPERS=y
213CONFIG_BACKLIGHT_LCD_SUPPORT=y
214# CONFIG_BACKLIGHT_GENERIC is not set 209# CONFIG_BACKLIGHT_GENERIC is not set
215CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y 210CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
216CONFIG_LOGO=y 211CONFIG_LOGO=y
@@ -246,8 +241,6 @@ CONFIG_EXT2_FS_XATTR=y
246CONFIG_EXT2_FS_SECURITY=y 241CONFIG_EXT2_FS_SECURITY=y
247CONFIG_EXT3_FS=y 242CONFIG_EXT3_FS=y
248CONFIG_EXT3_FS_SECURITY=y 243CONFIG_EXT3_FS_SECURITY=y
249CONFIG_EXT4_FS=y
250CONFIG_EXT4_FS_SECURITY=y
251CONFIG_XFS_FS=m 244CONFIG_XFS_FS=m
252CONFIG_BTRFS_FS=m 245CONFIG_BTRFS_FS=m
253CONFIG_QUOTA=y 246CONFIG_QUOTA=y
@@ -286,27 +279,16 @@ CONFIG_DEBUG_FS=y
286CONFIG_MAGIC_SYSRQ=y 279CONFIG_MAGIC_SYSRQ=y
287CONFIG_DEBUG_KERNEL=y 280CONFIG_DEBUG_KERNEL=y
288CONFIG_DEBUG_STACKOVERFLOW=y 281CONFIG_DEBUG_STACKOVERFLOW=y
289CONFIG_LOCKUP_DETECTOR=y
290CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
291CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
292# CONFIG_SCHED_DEBUG is not set 282# CONFIG_SCHED_DEBUG is not set
293CONFIG_TIMER_STATS=y
294CONFIG_CRYPTO_MANAGER=y 283CONFIG_CRYPTO_MANAGER=y
295CONFIG_CRYPTO_ECB=m 284CONFIG_CRYPTO_ECB=m
296CONFIG_CRYPTO_PCBC=m 285CONFIG_CRYPTO_PCBC=m
297CONFIG_CRYPTO_MD4=m 286CONFIG_CRYPTO_MD4=m
298CONFIG_CRYPTO_MD5=y 287CONFIG_CRYPTO_MD5=y
299CONFIG_CRYPTO_MICHAEL_MIC=m 288CONFIG_CRYPTO_MICHAEL_MIC=m
300CONFIG_CRYPTO_SHA256=m
301CONFIG_CRYPTO_ARC4=m 289CONFIG_CRYPTO_ARC4=m
302CONFIG_CRYPTO_FCRYPT=m 290CONFIG_CRYPTO_FCRYPT=m
303CONFIG_CRYPTO_DEFLATE=m 291CONFIG_CRYPTO_DEFLATE=m
304# CONFIG_CRYPTO_HW is not set 292# CONFIG_CRYPTO_HW is not set
305CONFIG_CRC_CCITT=m 293CONFIG_CRC_CCITT=m
306CONFIG_LIBCRC32C=y 294CONFIG_LIBCRC32C=y
307CONFIG_XZ_DEC_X86=y
308CONFIG_XZ_DEC_POWERPC=y
309CONFIG_XZ_DEC_IA64=y
310CONFIG_XZ_DEC_ARM=y
311CONFIG_XZ_DEC_ARMTHUMB=y
312CONFIG_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
231struct 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
232struct pdc_pat_pd_addr_map_entry { 243struct 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,
319extern int pdc_pat_mem_read_pd_pdt(struct pdc_pat_mem_read_pd_retinfo *pret, 330extern 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);
333extern 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}
459EXPORT_SYMBOL(copy_user_page); 459EXPORT_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)
577void flush_cache_range(struct vm_area_struct *vma, 581void 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
609void 602void
@@ -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 */
1508int 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
455panic_check: 459panic_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
957static struct attribute_group pdcs_attr_group = { 957static const struct attribute_group pdcs_attr_group = {
958 .attrs = pdcs_subsys_attrs, 958 .attrs = pdcs_subsys_attrs,
959}; 959};
960 960