Skip to content

Commit 36cb531

Browse files
committed
Merge branch 'parisc-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller: - The majority of lines changed are due to regenerated defconfig files. - The support for the Page Deallocation Table (PDT) which was merged in the merge window for 4.13 contained a bug which crashes the kernel if a bad page is reported by firmware. This is now fixed and the kernel messages will show which memory slot holds the broken DIMM. - Commit 3a166fc ("kbuild: handle libs-y archives separately from built-in.o archives") broke linking the parisc kernel due to millicode symbols which can't be reached then any longer. This was fixed by modifying the parisc vmlinux.lds linker script. - If the stack checker panics on stack overflow, avoid recursive panics. - Some parisc machines can't physically power off and thus instead start after some time to flood the console by presumably detected soft lockups. Avoid this by disabling the lockup detectors before entering the endless for-next loop. - Dave Anglin provided fixes which prevents TLB speculation on flushed pages on PA8800/PA9000 CPUs. - Arvind Yadav sent a trivial patch to constify the attribute_group structure in our firmware on-board-flash storage driver (pdc_stable.c) * 'parisc-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Extend disabled preemption in copy_user_page parisc: Prevent TLB speculation on flushed pages on CPUs that only support equivalent aliases parisc: Suspend lockup detectors before system halt parisc: Show DIMM slot number which holds broken memory module parisc: Add function to return DIMM slot of physical address parisc: Fix crash when calling PDC_PAT_MEM PDT firmware function parisc: regenerate defconfig files parisc: pdc_stable: constify attribute_group structures. parisc: Merge millicode routines via linker script parisc: Disable further stack checks when panic occurs during stack check
2 parents 8cdaad9 + 56008c0 commit 36cb531

File tree

16 files changed

+152
-254
lines changed

16 files changed

+152
-254
lines changed

arch/parisc/configs/712_defconfig

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
CONFIG_EXPERIMENTAL=y
21
# CONFIG_LOCALVERSION_AUTO is not set
32
CONFIG_SYSVIPC=y
43
CONFIG_POSIX_MQUEUE=y
54
CONFIG_IKCONFIG=y
65
CONFIG_IKCONFIG_PROC=y
76
CONFIG_LOG_BUF_SHIFT=16
8-
CONFIG_SYSFS_DEPRECATED_V2=y
97
CONFIG_BLK_DEV_INITRD=y
108
CONFIG_KALLSYMS_ALL=y
119
CONFIG_SLAB=y
@@ -14,7 +12,6 @@ CONFIG_OPROFILE=m
1412
CONFIG_MODULES=y
1513
CONFIG_MODULE_UNLOAD=y
1614
CONFIG_MODULE_FORCE_UNLOAD=y
17-
# CONFIG_BLK_DEV_BSG is not set
1815
CONFIG_PA7100LC=y
1916
CONFIG_PREEMPT_VOLUNTARY=y
2017
CONFIG_GSC_LASI=y
@@ -32,11 +29,9 @@ CONFIG_IP_PNP_DHCP=y
3229
CONFIG_IP_PNP_BOOTP=y
3330
CONFIG_INET_AH=m
3431
CONFIG_INET_ESP=m
35-
# CONFIG_INET_LRO is not set
3632
CONFIG_INET_DIAG=m
3733
# CONFIG_IPV6 is not set
3834
CONFIG_NETFILTER=y
39-
CONFIG_IP_NF_QUEUE=m
4035
CONFIG_LLC2=m
4136
CONFIG_NET_PKTGEN=m
4237
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -65,21 +60,20 @@ CONFIG_MD_LINEAR=m
6560
CONFIG_MD_RAID0=m
6661
CONFIG_MD_RAID1=m
6762
CONFIG_NETDEVICES=y
68-
CONFIG_DUMMY=m
6963
CONFIG_BONDING=m
64+
CONFIG_DUMMY=m
7065
CONFIG_TUN=m
71-
CONFIG_NET_ETHERNET=y
72-
CONFIG_MII=m
7366
CONFIG_LASI_82596=y
7467
CONFIG_PPP=m
75-
CONFIG_PPP_ASYNC=m
76-
CONFIG_PPP_SYNC_TTY=m
77-
CONFIG_PPP_DEFLATE=m
7868
CONFIG_PPP_BSDCOMP=m
69+
CONFIG_PPP_DEFLATE=m
7970
CONFIG_PPP_MPPE=m
8071
CONFIG_PPPOE=m
72+
CONFIG_PPP_ASYNC=m
73+
CONFIG_PPP_SYNC_TTY=m
8174
# CONFIG_KEYBOARD_HIL_OLD is not set
8275
CONFIG_MOUSE_SERIAL=m
76+
CONFIG_LEGACY_PTY_COUNT=64
8377
CONFIG_SERIAL_8250=y
8478
CONFIG_SERIAL_8250_CONSOLE=y
8579
CONFIG_SERIAL_8250_NR_UARTS=17
@@ -88,36 +82,27 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
8882
CONFIG_SERIAL_8250_SHARE_IRQ=y
8983
# CONFIG_SERIAL_MUX is not set
9084
CONFIG_PDC_CONSOLE=y
91-
CONFIG_LEGACY_PTY_COUNT=64
9285
CONFIG_PRINTER=m
9386
CONFIG_PPDEV=m
9487
# CONFIG_HW_RANDOM is not set
9588
CONFIG_RAW_DRIVER=y
9689
# CONFIG_HWMON is not set
97-
CONFIG_VIDEO_OUTPUT_CONTROL=m
9890
CONFIG_FB=y
9991
CONFIG_FB_MODE_HELPERS=y
10092
CONFIG_FB_TILEBLITTING=y
10193
CONFIG_DUMMY_CONSOLE_COLUMNS=128
10294
CONFIG_DUMMY_CONSOLE_ROWS=48
10395
CONFIG_FRAMEBUFFER_CONSOLE=y
104-
CONFIG_FONTS=y
105-
CONFIG_FONT_8x8=y
106-
CONFIG_FONT_8x16=y
10796
CONFIG_LOGO=y
10897
# CONFIG_LOGO_LINUX_MONO is not set
10998
# CONFIG_LOGO_LINUX_VGA16 is not set
11099
# CONFIG_LOGO_LINUX_CLUT224 is not set
111100
CONFIG_SOUND=y
112101
CONFIG_SND=y
113102
CONFIG_SND_SEQUENCER=y
114-
CONFIG_SND_MIXER_OSS=y
115-
CONFIG_SND_PCM_OSS=y
116-
CONFIG_SND_SEQUENCER_OSS=y
117103
CONFIG_SND_HARMONY=y
118104
CONFIG_EXT2_FS=y
119105
CONFIG_EXT3_FS=y
120-
# CONFIG_EXT3_FS_XATTR is not set
121106
CONFIG_JFS_FS=m
122107
CONFIG_XFS_FS=m
123108
CONFIG_AUTOFS4_FS=y
@@ -130,14 +115,10 @@ CONFIG_PROC_KCORE=y
130115
CONFIG_TMPFS=y
131116
CONFIG_UFS_FS=m
132117
CONFIG_NFS_FS=y
133-
CONFIG_NFS_V3=y
134118
CONFIG_NFS_V4=y
135119
CONFIG_ROOT_NFS=y
136120
CONFIG_NFSD=m
137121
CONFIG_NFSD_V4=y
138-
CONFIG_RPCSEC_GSS_SPKM3=m
139-
CONFIG_SMB_FS=m
140-
CONFIG_SMB_NLS_DEFAULT=y
141122
CONFIG_CIFS=m
142123
CONFIG_NLS_CODEPAGE_437=m
143124
CONFIG_NLS_CODEPAGE_737=m
@@ -177,21 +158,16 @@ CONFIG_NLS_ISO8859_15=m
177158
CONFIG_NLS_KOI8_R=m
178159
CONFIG_NLS_KOI8_U=m
179160
CONFIG_NLS_UTF8=m
180-
CONFIG_MAGIC_SYSRQ=y
181161
CONFIG_DEBUG_FS=y
162+
CONFIG_MAGIC_SYSRQ=y
182163
CONFIG_DEBUG_KERNEL=y
183164
CONFIG_DEBUG_MUTEXES=y
184-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
185-
CONFIG_CRYPTO_NULL=m
186165
CONFIG_CRYPTO_TEST=m
187166
CONFIG_CRYPTO_HMAC=y
188-
CONFIG_CRYPTO_MD4=m
189167
CONFIG_CRYPTO_MICHAEL_MIC=m
190-
CONFIG_CRYPTO_SHA256=m
191168
CONFIG_CRYPTO_SHA512=m
192169
CONFIG_CRYPTO_TGR192=m
193170
CONFIG_CRYPTO_WP512=m
194-
CONFIG_CRYPTO_AES=m
195171
CONFIG_CRYPTO_ANUBIS=m
196172
CONFIG_CRYPTO_BLOWFISH=m
197173
CONFIG_CRYPTO_CAST6=m
@@ -200,6 +176,7 @@ CONFIG_CRYPTO_SERPENT=m
200176
CONFIG_CRYPTO_TEA=m
201177
CONFIG_CRYPTO_TWOFISH=m
202178
CONFIG_CRYPTO_DEFLATE=m
203-
# CONFIG_CRYPTO_ANSI_CPRNG is not set
204179
# CONFIG_CRYPTO_HW is not set
205-
CONFIG_LIBCRC32C=m
180+
CONFIG_FONTS=y
181+
CONFIG_FONT_8x8=y
182+
CONFIG_FONT_8x16=y

arch/parisc/configs/a500_defconfig

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
CONFIG_EXPERIMENTAL=y
21
# CONFIG_LOCALVERSION_AUTO is not set
32
CONFIG_SYSVIPC=y
43
CONFIG_POSIX_MQUEUE=y
54
CONFIG_IKCONFIG=y
65
CONFIG_IKCONFIG_PROC=y
76
CONFIG_LOG_BUF_SHIFT=16
8-
CONFIG_SYSFS_DEPRECATED_V2=y
97
CONFIG_BLK_DEV_INITRD=y
10-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
118
CONFIG_EXPERT=y
129
CONFIG_KALLSYMS_ALL=y
1310
CONFIG_SLAB=y
@@ -16,7 +13,6 @@ CONFIG_OPROFILE=m
1613
CONFIG_MODULES=y
1714
CONFIG_MODULE_UNLOAD=y
1815
CONFIG_MODULE_FORCE_UNLOAD=y
19-
# CONFIG_BLK_DEV_BSG is not set
2016
CONFIG_PA8X00=y
2117
CONFIG_64BIT=y
2218
CONFIG_SMP=y
@@ -43,21 +39,17 @@ CONFIG_IP_PNP_DHCP=y
4339
CONFIG_IP_PNP_BOOTP=y
4440
CONFIG_INET_AH=m
4541
CONFIG_INET_ESP=m
46-
# CONFIG_INET_LRO is not set
4742
CONFIG_INET6_AH=m
4843
CONFIG_INET6_ESP=m
4944
CONFIG_INET6_IPCOMP=m
5045
CONFIG_IPV6_TUNNEL=m
5146
CONFIG_NETFILTER=y
5247
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
53-
CONFIG_IP_NF_QUEUE=m
5448
CONFIG_IP_NF_IPTABLES=m
5549
CONFIG_IP_NF_MATCH_ECN=m
5650
CONFIG_IP_NF_MATCH_TTL=m
5751
CONFIG_IP_NF_FILTER=m
5852
CONFIG_IP_NF_TARGET_REJECT=m
59-
CONFIG_IP_NF_TARGET_LOG=m
60-
CONFIG_IP_NF_TARGET_ULOG=m
6153
CONFIG_IP_NF_MANGLE=m
6254
CONFIG_IP_NF_TARGET_ECN=m
6355
CONFIG_IP_NF_RAW=m
@@ -70,7 +62,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
7062
CONFIG_IP6_NF_MATCH_HL=m
7163
CONFIG_IP6_NF_MATCH_IPV6HEADER=m
7264
CONFIG_IP6_NF_MATCH_RT=m
73-
CONFIG_IP6_NF_TARGET_LOG=m
7465
CONFIG_IP6_NF_FILTER=m
7566
CONFIG_IP6_NF_TARGET_REJECT=m
7667
CONFIG_IP6_NF_MANGLE=m
@@ -94,7 +85,6 @@ CONFIG_BLK_DEV_SD=y
9485
CONFIG_CHR_DEV_ST=y
9586
CONFIG_BLK_DEV_SR=y
9687
CONFIG_CHR_DEV_SG=y
97-
CONFIG_SCSI_MULTI_LUN=y
9888
CONFIG_SCSI_ISCSI_ATTRS=m
9989
CONFIG_SCSI_SYM53C8XX_2=y
10090
CONFIG_SCSI_QLOGIC_1280=m
@@ -106,43 +96,38 @@ CONFIG_MD_RAID0=y
10696
CONFIG_MD_RAID1=y
10797
CONFIG_FUSION=y
10898
CONFIG_FUSION_SPI=m
109-
CONFIG_FUSION_FC=m
11099
CONFIG_FUSION_CTL=m
111100
CONFIG_NETDEVICES=y
112-
CONFIG_DUMMY=m
113101
CONFIG_BONDING=m
102+
CONFIG_DUMMY=m
114103
CONFIG_TUN=m
115-
CONFIG_NET_ETHERNET=y
116-
CONFIG_NET_VENDOR_3COM=y
104+
CONFIG_PCMCIA_3C574=m
105+
CONFIG_PCMCIA_3C589=m
117106
CONFIG_VORTEX=m
118107
CONFIG_TYPHOON=m
108+
CONFIG_ACENIC=m
109+
CONFIG_ACENIC_OMIT_TIGON_I=y
110+
CONFIG_PCNET32=m
111+
CONFIG_TIGON3=m
119112
CONFIG_NET_TULIP=y
120113
CONFIG_DE2104X=m
121114
CONFIG_TULIP=y
122115
CONFIG_TULIP_MMIO=y
123116
CONFIG_PCMCIA_XIRCOM=m
124117
CONFIG_HP100=m
125-
CONFIG_NET_PCI=y
126-
CONFIG_PCNET32=m
127118
CONFIG_E100=m
128-
CONFIG_ACENIC=m
129-
CONFIG_ACENIC_OMIT_TIGON_I=y
130119
CONFIG_E1000=m
131-
CONFIG_TIGON3=m
132-
CONFIG_NET_PCMCIA=y
133-
CONFIG_PCMCIA_3C589=m
134-
CONFIG_PCMCIA_3C574=m
135120
CONFIG_PCMCIA_SMC91C92=m
136121
CONFIG_PCMCIA_XIRC2PS=m
137122
CONFIG_PPP=m
123+
CONFIG_PPP_BSDCOMP=m
124+
CONFIG_PPP_DEFLATE=m
138125
CONFIG_PPP_ASYNC=m
139126
CONFIG_PPP_SYNC_TTY=m
140-
CONFIG_PPP_DEFLATE=m
141-
CONFIG_PPP_BSDCOMP=m
142-
# CONFIG_INPUT_MOUSEDEV is not set
143127
# CONFIG_INPUT_KEYBOARD is not set
144128
# CONFIG_INPUT_MOUSE is not set
145129
# CONFIG_SERIO is not set
130+
# CONFIG_LEGACY_PTYS is not set
146131
CONFIG_SERIAL_8250=y
147132
CONFIG_SERIAL_8250_CONSOLE=y
148133
CONFIG_SERIAL_8250_CS=m
@@ -151,7 +136,6 @@ CONFIG_SERIAL_8250_EXTENDED=y
151136
CONFIG_SERIAL_8250_MANY_PORTS=y
152137
CONFIG_SERIAL_8250_SHARE_IRQ=y
153138
CONFIG_PDC_CONSOLE=y
154-
# CONFIG_LEGACY_PTYS is not set
155139
# CONFIG_HW_RANDOM is not set
156140
CONFIG_RAW_DRIVER=y
157141
# CONFIG_HWMON is not set
@@ -160,7 +144,6 @@ CONFIG_AGP_PARISC=y
160144
# CONFIG_STI_CONSOLE is not set
161145
CONFIG_EXT2_FS=y
162146
CONFIG_EXT3_FS=y
163-
# CONFIG_EXT3_FS_XATTR is not set
164147
CONFIG_JFS_FS=m
165148
CONFIG_XFS_FS=m
166149
CONFIG_AUTOFS4_FS=y
@@ -173,31 +156,22 @@ CONFIG_PROC_KCORE=y
173156
CONFIG_TMPFS=y
174157
CONFIG_UFS_FS=m
175158
CONFIG_NFS_FS=m
176-
CONFIG_NFS_V3=y
177-
CONFIG_NFS_V4=y
159+
CONFIG_NFS_V4=m
178160
CONFIG_NFSD=m
179161
CONFIG_NFSD_V4=y
180-
CONFIG_RPCSEC_GSS_SPKM3=m
181-
CONFIG_SMB_FS=m
182-
CONFIG_SMB_NLS_DEFAULT=y
183162
CONFIG_CIFS=m
184163
CONFIG_NLS_CODEPAGE_437=m
185164
CONFIG_NLS_CODEPAGE_850=m
186165
CONFIG_NLS_ASCII=m
187166
CONFIG_NLS_ISO8859_1=m
188167
CONFIG_NLS_ISO8859_15=m
189168
CONFIG_NLS_UTF8=m
190-
CONFIG_MAGIC_SYSRQ=y
191169
CONFIG_DEBUG_FS=y
192170
CONFIG_HEADERS_CHECK=y
193-
CONFIG_DEBUG_KERNEL=y
171+
CONFIG_MAGIC_SYSRQ=y
194172
# CONFIG_DEBUG_BUGVERBOSE is not set
195-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
196-
CONFIG_CRYPTO_NULL=m
197173
CONFIG_CRYPTO_TEST=m
198174
CONFIG_CRYPTO_HMAC=y
199175
CONFIG_CRYPTO_MD5=y
200176
CONFIG_CRYPTO_BLOWFISH=m
201-
# CONFIG_CRYPTO_ANSI_CPRNG is not set
202177
# CONFIG_CRYPTO_HW is not set
203-
CONFIG_LIBCRC32C=m

arch/parisc/configs/b180_defconfig

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ CONFIG_SYSVIPC=y
33
CONFIG_IKCONFIG=y
44
CONFIG_IKCONFIG_PROC=y
55
CONFIG_LOG_BUF_SHIFT=16
6-
CONFIG_SYSFS_DEPRECATED_V2=y
76
CONFIG_BLK_DEV_INITRD=y
87
CONFIG_SLAB=y
98
CONFIG_MODULES=y
@@ -25,8 +24,6 @@ CONFIG_INET=y
2524
CONFIG_IP_MULTICAST=y
2625
CONFIG_IP_PNP=y
2726
CONFIG_IP_PNP_BOOTP=y
28-
# CONFIG_INET_LRO is not set
29-
CONFIG_IPV6=y
3027
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
3128
CONFIG_DEVTMPFS=y
3229
CONFIG_DEVTMPFS_MOUNT=y
@@ -53,10 +50,9 @@ CONFIG_MD_LINEAR=y
5350
CONFIG_MD_RAID0=y
5451
CONFIG_MD_RAID1=y
5552
CONFIG_NETDEVICES=y
56-
CONFIG_NET_ETHERNET=y
57-
CONFIG_LASI_82596=y
5853
CONFIG_NET_TULIP=y
5954
CONFIG_TULIP=y
55+
CONFIG_LASI_82596=y
6056
CONFIG_PPP=y
6157
CONFIG_INPUT_EVDEV=y
6258
# CONFIG_KEYBOARD_HIL_OLD is not set
@@ -71,40 +67,31 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
7167
CONFIG_PRINTER=y
7268
# CONFIG_HW_RANDOM is not set
7369
# CONFIG_HWMON is not set
74-
CONFIG_VIDEO_OUTPUT_CONTROL=m
7570
CONFIG_FB=y
7671
CONFIG_FRAMEBUFFER_CONSOLE=y
7772
CONFIG_LOGO=y
7873
CONFIG_SOUND=y
7974
CONFIG_SND=y
8075
CONFIG_SND_SEQUENCER=y
81-
CONFIG_SND_MIXER_OSS=y
82-
CONFIG_SND_PCM_OSS=y
83-
CONFIG_SND_SEQUENCER_OSS=y
8476
CONFIG_SND_HARMONY=y
8577
CONFIG_EXT2_FS=y
8678
CONFIG_EXT3_FS=y
87-
# CONFIG_EXT3_FS_XATTR is not set
8879
CONFIG_AUTOFS4_FS=y
8980
CONFIG_ISO9660_FS=y
9081
CONFIG_JOLIET=y
9182
CONFIG_PROC_KCORE=y
9283
CONFIG_TMPFS=y
9384
CONFIG_NFS_FS=y
94-
CONFIG_NFS_V3=y
9585
CONFIG_ROOT_NFS=y
9686
CONFIG_NFSD=y
9787
CONFIG_NFSD_V3=y
98-
CONFIG_SMB_FS=y
9988
CONFIG_NLS_CODEPAGE_437=m
10089
CONFIG_NLS_CODEPAGE_850=m
10190
CONFIG_NLS_ASCII=m
10291
CONFIG_NLS_ISO8859_1=m
10392
CONFIG_NLS_ISO8859_15=m
10493
CONFIG_NLS_UTF8=m
105-
CONFIG_MAGIC_SYSRQ=y
10694
CONFIG_HEADERS_CHECK=y
95+
CONFIG_MAGIC_SYSRQ=y
10796
CONFIG_DEBUG_KERNEL=y
108-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
10997
CONFIG_SECURITY=y
110-
# CONFIG_CRYPTO_ANSI_CPRNG is not set

0 commit comments

Comments
 (0)