Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt:
"I meant to sent that earlier but got swamped with other things, so
here are some powerpc fixes for 3.6. A few regression fixes and some
bug fixes that I deemed should still make it.
There's a FSL update from Kumar with a bunch of defconfig updates
along with a few embedded fixes.
I also reverted my g5_defconfig update that I merged earlier as it was
completely busted, not too sure what happened there, I'll do a new one
later."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
Revert "powerpc: Update g5_defconfig"
powerpc/perf: Use pmc_overflow() to detect rolled back events
powerpc: Fix VMX in interrupt check in POWER7 copy loops
powerpc: POWER7 copy_to_user/copy_from_user patch applied twice
powerpc: Fix personality handling in ppc64_personality()
powerpc/dma-iommu: Fix IOMMU window check
powerpc: Remove unnecessary ifdefs
powerpc/kgdb: Restore current_thread_info properly
powerpc/kgdb: Bail out of KGDB when we've been triggered
powerpc/kgdb: Do not set kgdb_single_step on ppc
powerpc/mpic_msgr: Add missing includes
powerpc: Fix null pointer deref in perf hardware breakpoints
powerpc: Fixup whitespace in xmon
powerpc: Fix xmon dl command for new printk implementation
powerpc/fsl: fix "Failed to mount /dev: No such device" errors
powerpc/fsl: update defconfigs
booke/wdt: some ioctls do not return values properly
powerpc/p4080ds: dts - add usb controller version info and port0
powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS
powerpc/fsl-pci: Only scan PCI bus if configured as a host
+206
-239
+7
arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
+7
arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
···
345
345
/include/ "qoriq-duart-1.dtsi"
346
346
/include/ "qoriq-gpio-0.dtsi"
347
347
/include/ "qoriq-usb2-mph-0.dtsi"
348
+
usb@210000 {
349
+
compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";
350
+
port0;
351
+
};
348
352
/include/ "qoriq-usb2-dr-0.dtsi"
353
+
usb@211000 {
354
+
compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
355
+
};
349
356
/include/ "qoriq-sec4.0-0.dtsi"
350
357
};
+10
-21
arch/powerpc/configs/85xx/p1023rds_defconfig
+10
-21
arch/powerpc/configs/85xx/p1023rds_defconfig
···
6
6
CONFIG_POSIX_MQUEUE=y
7
7
CONFIG_BSD_PROCESS_ACCT=y
8
8
CONFIG_AUDIT=y
9
-
CONFIG_SPARSE_IRQ=y
9
+
CONFIG_IRQ_DOMAIN_DEBUG=y
10
+
CONFIG_NO_HZ=y
11
+
CONFIG_HIGH_RES_TIMERS=y
10
12
CONFIG_IKCONFIG=y
11
13
CONFIG_IKCONFIG_PROC=y
12
14
CONFIG_LOG_BUF_SHIFT=14
13
15
CONFIG_BLK_DEV_INITRD=y
14
-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
15
16
CONFIG_KALLSYMS_ALL=y
16
-
CONFIG_KALLSYMS_EXTRA_PASS=y
17
17
CONFIG_EMBEDDED=y
18
18
CONFIG_MODULES=y
19
19
CONFIG_MODULE_UNLOAD=y
20
20
CONFIG_MODULE_FORCE_UNLOAD=y
21
21
CONFIG_MODVERSIONS=y
22
22
# CONFIG_BLK_DEV_BSG is not set
23
+
CONFIG_PARTITION_ADVANCED=y
24
+
CONFIG_MAC_PARTITION=y
23
25
CONFIG_P1023_RDS=y
24
26
CONFIG_QUICC_ENGINE=y
25
27
CONFIG_QE_GPIO=y
26
28
CONFIG_CPM2=y
27
-
CONFIG_GPIO_MPC8XXX=y
28
29
CONFIG_HIGHMEM=y
29
-
CONFIG_NO_HZ=y
30
-
CONFIG_HIGH_RES_TIMERS=y
31
30
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32
31
CONFIG_BINFMT_MISC=m
33
32
CONFIG_MATH_EMULATION=y
···
62
63
CONFIG_IPV6=y
63
64
CONFIG_IP_SCTP=m
64
65
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
66
+
CONFIG_DEVTMPFS=y
65
67
CONFIG_PROC_DEVICETREE=y
66
68
CONFIG_BLK_DEV_LOOP=y
67
69
CONFIG_BLK_DEV_RAM=y
68
70
CONFIG_BLK_DEV_RAM_SIZE=131072
69
-
CONFIG_MISC_DEVICES=y
70
71
CONFIG_EEPROM_LEGACY=y
71
72
CONFIG_BLK_DEV_SD=y
72
73
CONFIG_CHR_DEV_ST=y
···
79
80
CONFIG_SATA_SIL24=y
80
81
CONFIG_NETDEVICES=y
81
82
CONFIG_DUMMY=y
83
+
CONFIG_FS_ENET=y
84
+
CONFIG_FSL_PQ_MDIO=y
85
+
CONFIG_E1000E=y
82
86
CONFIG_MARVELL_PHY=y
83
87
CONFIG_DAVICOM_PHY=y
84
88
CONFIG_CICADA_PHY=y
85
89
CONFIG_VITESSE_PHY=y
86
90
CONFIG_FIXED_PHY=y
87
-
CONFIG_NET_ETHERNET=y
88
-
CONFIG_FS_ENET=y
89
-
CONFIG_E1000E=y
90
-
CONFIG_FSL_PQ_MDIO=y
91
91
CONFIG_INPUT_FF_MEMLESS=m
92
92
# CONFIG_INPUT_MOUSEDEV is not set
93
93
# CONFIG_INPUT_KEYBOARD is not set
···
96
98
CONFIG_SERIAL_8250_CONSOLE=y
97
99
CONFIG_SERIAL_8250_NR_UARTS=2
98
100
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
99
-
CONFIG_SERIAL_8250_EXTENDED=y
100
101
CONFIG_SERIAL_8250_MANY_PORTS=y
101
102
CONFIG_SERIAL_8250_DETECT_IRQ=y
102
103
CONFIG_SERIAL_8250_RSA=y
103
104
CONFIG_SERIAL_QE=m
104
-
CONFIG_HW_RANDOM=y
105
105
CONFIG_NVRAM=y
106
106
CONFIG_I2C=y
107
107
CONFIG_I2C_CPM=m
108
108
CONFIG_I2C_MPC=y
109
+
CONFIG_GPIO_MPC8XXX=y
109
110
# CONFIG_HWMON is not set
110
111
CONFIG_VIDEO_OUTPUT_CONTROL=y
111
112
CONFIG_SOUND=y
···
120
123
CONFIG_FSL_DMA=y
121
124
# CONFIG_NET_DMA is not set
122
125
CONFIG_STAGING=y
123
-
# CONFIG_STAGING_EXCLUDE_BUILD is not set
124
126
CONFIG_EXT2_FS=y
125
127
CONFIG_EXT3_FS=y
126
128
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
···
146
150
CONFIG_SYSV_FS=m
147
151
CONFIG_UFS_FS=m
148
152
CONFIG_NFS_FS=y
149
-
CONFIG_NFS_V3=y
150
153
CONFIG_NFS_V4=y
151
154
CONFIG_ROOT_NFS=y
152
155
CONFIG_NFSD=y
153
-
CONFIG_PARTITION_ADVANCED=y
154
-
CONFIG_MAC_PARTITION=y
155
156
CONFIG_CRC_T10DIF=y
156
157
CONFIG_FRAME_WARN=8092
157
158
CONFIG_DEBUG_FS=y
158
-
CONFIG_DEBUG_KERNEL=y
159
159
CONFIG_DETECT_HUNG_TASK=y
160
160
# CONFIG_DEBUG_BUGVERBOSE is not set
161
161
CONFIG_DEBUG_INFO=y
162
-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
163
-
CONFIG_SYSCTL_SYSCALL_CHECK=y
164
-
CONFIG_IRQ_DOMAIN_DEBUG=y
165
162
CONFIG_CRYPTO_PCBC=m
166
163
CONFIG_CRYPTO_SHA256=y
167
164
CONFIG_CRYPTO_SHA512=y
+10
-21
arch/powerpc/configs/corenet32_smp_defconfig
+10
-21
arch/powerpc/configs/corenet32_smp_defconfig
···
6
6
CONFIG_POSIX_MQUEUE=y
7
7
CONFIG_BSD_PROCESS_ACCT=y
8
8
CONFIG_AUDIT=y
9
-
CONFIG_SPARSE_IRQ=y
10
-
CONFIG_RCU_TRACE=y
9
+
CONFIG_NO_HZ=y
10
+
CONFIG_HIGH_RES_TIMERS=y
11
11
CONFIG_IKCONFIG=y
12
12
CONFIG_IKCONFIG_PROC=y
13
13
CONFIG_LOG_BUF_SHIFT=14
···
21
21
CONFIG_MODULE_FORCE_UNLOAD=y
22
22
CONFIG_MODVERSIONS=y
23
23
# CONFIG_BLK_DEV_BSG is not set
24
+
CONFIG_PARTITION_ADVANCED=y
25
+
CONFIG_MAC_PARTITION=y
24
26
CONFIG_P2041_RDB=y
25
27
CONFIG_P3041_DS=y
26
28
CONFIG_P4080_DS=y
27
29
CONFIG_P5020_DS=y
28
30
CONFIG_HIGHMEM=y
29
-
CONFIG_NO_HZ=y
30
-
CONFIG_HIGH_RES_TIMERS=y
31
31
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32
32
CONFIG_BINFMT_MISC=m
33
33
CONFIG_KEXEC=y
34
34
CONFIG_IRQ_ALL_CPUS=y
35
35
CONFIG_FORCE_MAX_ZONEORDER=13
36
-
CONFIG_FSL_LBC=y
37
36
CONFIG_PCI=y
38
37
CONFIG_PCIEPORTBUS=y
39
-
CONFIG_PCI_MSI=y
40
38
# CONFIG_PCIEASPM is not set
39
+
CONFIG_PCI_MSI=y
41
40
CONFIG_RAPIDIO=y
42
41
CONFIG_FSL_RIO=y
43
42
CONFIG_NET=y
···
69
70
CONFIG_IPV6=y
70
71
CONFIG_IP_SCTP=m
71
72
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
73
+
CONFIG_DEVTMPFS=y
72
74
CONFIG_MTD=y
73
75
CONFIG_MTD_CMDLINE_PARTS=y
74
76
CONFIG_MTD_CHAR=y
···
77
77
CONFIG_MTD_CFI=y
78
78
CONFIG_MTD_CFI_AMDSTD=y
79
79
CONFIG_MTD_PHYSMAP_OF=y
80
-
CONFIG_MTD_NAND=y
81
-
CONFIG_MTD_NAND_ECC=y
82
-
CONFIG_MTD_NAND_IDS=y
83
-
CONFIG_MTD_NAND_FSL_IFC=y
84
-
CONFIG_MTD_NAND_FSL_ELBC=y
85
80
CONFIG_MTD_M25P80=y
81
+
CONFIG_MTD_NAND=y
82
+
CONFIG_MTD_NAND_FSL_ELBC=y
83
+
CONFIG_MTD_NAND_FSL_IFC=y
86
84
CONFIG_PROC_DEVICETREE=y
87
85
CONFIG_BLK_DEV_LOOP=y
88
86
CONFIG_BLK_DEV_RAM=y
89
87
CONFIG_BLK_DEV_RAM_SIZE=131072
90
-
CONFIG_MISC_DEVICES=y
91
88
CONFIG_BLK_DEV_SD=y
92
89
CONFIG_CHR_DEV_ST=y
93
90
CONFIG_BLK_DEV_SR=y
···
112
115
CONFIG_PPC_EPAPR_HV_BYTECHAN=y
113
116
CONFIG_SERIAL_8250=y
114
117
CONFIG_SERIAL_8250_CONSOLE=y
115
-
CONFIG_SERIAL_8250_EXTENDED=y
116
118
CONFIG_SERIAL_8250_MANY_PORTS=y
117
119
CONFIG_SERIAL_8250_DETECT_IRQ=y
118
120
CONFIG_SERIAL_8250_RSA=y
119
-
CONFIG_HW_RANDOM=y
120
121
CONFIG_NVRAM=y
121
122
CONFIG_I2C=y
122
123
CONFIG_I2C_CHARDEV=y
···
127
132
CONFIG_VIDEO_OUTPUT_CONTROL=y
128
133
CONFIG_USB_HID=m
129
134
CONFIG_USB=y
130
-
CONFIG_USB_DEVICEFS=y
131
135
CONFIG_USB_MON=y
132
136
CONFIG_USB_EHCI_HCD=y
133
137
CONFIG_USB_EHCI_FSL=y
···
136
142
CONFIG_USB_STORAGE=y
137
143
CONFIG_MMC=y
138
144
CONFIG_MMC_SDHCI=y
139
-
CONFIG_MMC_SDHCI_OF=y
140
-
CONFIG_MMC_SDHCI_OF_ESDHC=y
141
145
CONFIG_EDAC=y
142
146
CONFIG_EDAC_MM_EDAC=y
143
147
CONFIG_EDAC_MPC85XX=y
···
162
170
CONFIG_JFFS2_FS=y
163
171
CONFIG_CRAMFS=y
164
172
CONFIG_NFS_FS=y
165
-
CONFIG_NFS_V3=y
166
173
CONFIG_NFS_V4=y
167
174
CONFIG_ROOT_NFS=y
168
175
CONFIG_NFSD=m
169
-
CONFIG_PARTITION_ADVANCED=y
170
-
CONFIG_MAC_PARTITION=y
171
176
CONFIG_NLS_ISO8859_1=y
172
177
CONFIG_NLS_UTF8=m
173
178
CONFIG_MAGIC_SYSRQ=y
174
179
CONFIG_DEBUG_SHIRQ=y
175
180
CONFIG_DETECT_HUNG_TASK=y
176
181
CONFIG_DEBUG_INFO=y
177
-
CONFIG_SYSCTL_SYSCALL_CHECK=y
182
+
CONFIG_RCU_TRACE=y
178
183
CONFIG_CRYPTO_NULL=y
179
184
CONFIG_CRYPTO_PCBC=m
180
185
CONFIG_CRYPTO_MD4=y
+1
arch/powerpc/configs/corenet64_smp_defconfig
+1
arch/powerpc/configs/corenet64_smp_defconfig
+73
-30
arch/powerpc/configs/g5_defconfig
+73
-30
arch/powerpc/configs/g5_defconfig
···
1
+
CONFIG_PPC64=y
2
+
CONFIG_ALTIVEC=y
3
+
CONFIG_SMP=y
4
+
CONFIG_NR_CPUS=4
1
5
CONFIG_EXPERIMENTAL=y
2
6
CONFIG_SYSVIPC=y
3
7
CONFIG_POSIX_MQUEUE=y
4
-
CONFIG_NO_HZ=y
5
-
CONFIG_HIGH_RES_TIMERS=y
6
8
CONFIG_IKCONFIG=y
7
9
CONFIG_IKCONFIG_PROC=y
8
10
CONFIG_BLK_DEV_INITRD=y
···
15
13
CONFIG_MODULE_UNLOAD=y
16
14
CONFIG_MODVERSIONS=y
17
15
CONFIG_MODULE_SRCVERSION_ALL=y
18
-
CONFIG_PARTITION_ADVANCED=y
19
-
CONFIG_MAC_PARTITION=y
20
-
CONFIG_SMP=y
21
-
CONFIG_NR_CPUS=4
22
-
CONFIG_KEXEC=y
23
-
# CONFIG_RELOCATABLE is not set
16
+
# CONFIG_PPC_PSERIES is not set
24
17
CONFIG_CPU_FREQ=y
25
18
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
26
19
CONFIG_CPU_FREQ_GOV_USERSPACE=y
20
+
CONFIG_CPU_FREQ_PMAC64=y
21
+
CONFIG_NO_HZ=y
22
+
CONFIG_HIGH_RES_TIMERS=y
23
+
CONFIG_KEXEC=y
24
+
CONFIG_IRQ_ALL_CPUS=y
25
+
# CONFIG_MIGRATION is not set
27
26
CONFIG_PCI_MSI=y
28
27
CONFIG_NET=y
29
28
CONFIG_PACKET=y
···
52
49
CONFIG_NF_CONNTRACK_IPV4=m
53
50
CONFIG_IP_NF_QUEUE=m
54
51
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
52
+
CONFIG_PROC_DEVICETREE=y
55
53
CONFIG_BLK_DEV_LOOP=y
56
54
CONFIG_BLK_DEV_NBD=m
57
55
CONFIG_BLK_DEV_RAM=y
···
60
56
CONFIG_CDROM_PKTCDVD=m
61
57
CONFIG_IDE=y
62
58
CONFIG_BLK_DEV_IDECD=y
59
+
CONFIG_BLK_DEV_IDE_PMAC=y
60
+
CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
63
61
CONFIG_BLK_DEV_SD=y
64
62
CONFIG_CHR_DEV_ST=y
65
63
CONFIG_BLK_DEV_SR=y
···
85
79
CONFIG_DM_SNAPSHOT=m
86
80
CONFIG_DM_MIRROR=m
87
81
CONFIG_DM_ZERO=m
88
-
CONFIG_MACINTOSH_DRIVERS=y
82
+
CONFIG_IEEE1394=y
83
+
CONFIG_IEEE1394_OHCI1394=y
84
+
CONFIG_IEEE1394_SBP2=m
85
+
CONFIG_IEEE1394_ETH1394=m
86
+
CONFIG_IEEE1394_RAWIO=y
87
+
CONFIG_IEEE1394_VIDEO1394=m
88
+
CONFIG_IEEE1394_DV1394=m
89
+
CONFIG_ADB_PMU=y
90
+
CONFIG_PMAC_SMU=y
89
91
CONFIG_MAC_EMUMOUSEBTN=y
92
+
CONFIG_THERM_PM72=y
93
+
CONFIG_WINDFARM=y
94
+
CONFIG_WINDFARM_PM81=y
95
+
CONFIG_WINDFARM_PM91=y
96
+
CONFIG_WINDFARM_PM112=y
97
+
CONFIG_WINDFARM_PM121=y
90
98
CONFIG_NETDEVICES=y
91
-
CONFIG_BONDING=m
92
99
CONFIG_DUMMY=m
93
-
CONFIG_MII=y
100
+
CONFIG_BONDING=m
94
101
CONFIG_TUN=m
102
+
CONFIG_NET_ETHERNET=y
103
+
CONFIG_MII=y
104
+
CONFIG_SUNGEM=y
95
105
CONFIG_ACENIC=m
96
106
CONFIG_ACENIC_OMIT_TIGON_I=y
97
-
CONFIG_TIGON3=y
98
107
CONFIG_E1000=y
99
-
CONFIG_SUNGEM=y
100
-
CONFIG_PPP=m
101
-
CONFIG_PPP_BSDCOMP=m
102
-
CONFIG_PPP_DEFLATE=m
103
-
CONFIG_PPPOE=m
104
-
CONFIG_PPP_ASYNC=m
105
-
CONFIG_PPP_SYNC_TTY=m
108
+
CONFIG_TIGON3=y
106
109
CONFIG_USB_CATC=m
107
110
CONFIG_USB_KAWETH=m
108
111
CONFIG_USB_PEGASUS=m
···
121
106
# CONFIG_USB_NET_NET1080 is not set
122
107
# CONFIG_USB_NET_CDC_SUBSET is not set
123
108
# CONFIG_USB_NET_ZAURUS is not set
109
+
CONFIG_PPP=m
110
+
CONFIG_PPP_ASYNC=m
111
+
CONFIG_PPP_SYNC_TTY=m
112
+
CONFIG_PPP_DEFLATE=m
113
+
CONFIG_PPP_BSDCOMP=m
114
+
CONFIG_PPPOE=m
124
115
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
125
116
CONFIG_INPUT_JOYDEV=m
126
117
CONFIG_INPUT_EVDEV=y
118
+
# CONFIG_KEYBOARD_ATKBD is not set
127
119
# CONFIG_MOUSE_PS2 is not set
120
+
# CONFIG_SERIO_I8042 is not set
128
121
# CONFIG_SERIO_SERPORT is not set
129
-
CONFIG_VT_HW_CONSOLE_BINDING=y
130
122
# CONFIG_HW_RANDOM is not set
131
123
CONFIG_GEN_RTC=y
132
124
CONFIG_RAW_DRIVER=y
133
125
CONFIG_I2C_CHARDEV=y
134
126
# CONFIG_HWMON is not set
135
-
CONFIG_AGP=y
136
-
CONFIG_DRM=y
137
-
CONFIG_DRM_NOUVEAU=y
127
+
CONFIG_AGP=m
128
+
CONFIG_AGP_UNINORTH=m
138
129
CONFIG_VIDEO_OUTPUT_CONTROL=m
130
+
CONFIG_FB=y
139
131
CONFIG_FIRMWARE_EDID=y
140
132
CONFIG_FB_TILEBLITTING=y
133
+
CONFIG_FB_OF=y
134
+
CONFIG_FB_NVIDIA=y
135
+
CONFIG_FB_NVIDIA_I2C=y
141
136
CONFIG_FB_RADEON=y
137
+
# CONFIG_VGA_CONSOLE is not set
138
+
CONFIG_FRAMEBUFFER_CONSOLE=y
142
139
CONFIG_LOGO=y
143
140
CONFIG_SOUND=m
144
141
CONFIG_SND=m
···
158
131
CONFIG_SND_MIXER_OSS=m
159
132
CONFIG_SND_PCM_OSS=m
160
133
CONFIG_SND_SEQUENCER_OSS=y
134
+
CONFIG_SND_POWERMAC=m
135
+
CONFIG_SND_AOA=m
136
+
CONFIG_SND_AOA_FABRIC_LAYOUT=m
137
+
CONFIG_SND_AOA_ONYX=m
138
+
CONFIG_SND_AOA_TAS=m
139
+
CONFIG_SND_AOA_TOONIE=m
161
140
CONFIG_SND_USB_AUDIO=m
141
+
CONFIG_HID_PID=y
142
+
CONFIG_USB_HIDDEV=y
162
143
CONFIG_HID_GYRATION=y
163
144
CONFIG_LOGITECH_FF=y
164
145
CONFIG_HID_PANTHERLORD=y
···
174
139
CONFIG_HID_SAMSUNG=y
175
140
CONFIG_HID_SONY=y
176
141
CONFIG_HID_SUNPLUS=y
177
-
CONFIG_HID_PID=y
178
-
CONFIG_USB_HIDDEV=y
179
142
CONFIG_USB=y
143
+
CONFIG_USB_DEVICEFS=y
180
144
CONFIG_USB_MON=y
181
145
CONFIG_USB_EHCI_HCD=y
146
+
# CONFIG_USB_EHCI_HCD_PPC_OF is not set
182
147
CONFIG_USB_OHCI_HCD=y
148
+
CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
183
149
CONFIG_USB_ACM=m
184
150
CONFIG_USB_PRINTER=y
185
151
CONFIG_USB_STORAGE=y
···
244
208
CONFIG_REISERFS_FS_SECURITY=y
245
209
CONFIG_XFS_FS=m
246
210
CONFIG_XFS_POSIX_ACL=y
211
+
CONFIG_INOTIFY=y
212
+
CONFIG_AUTOFS_FS=m
247
213
CONFIG_ISO9660_FS=y
248
214
CONFIG_JOLIET=y
249
215
CONFIG_ZISOFS=y
···
259
221
CONFIG_HFSPLUS_FS=m
260
222
CONFIG_CRAMFS=y
261
223
CONFIG_NFS_FS=y
224
+
CONFIG_NFS_V3=y
262
225
CONFIG_NFS_V3_ACL=y
263
226
CONFIG_NFS_V4=y
264
227
CONFIG_NFSD=y
265
228
CONFIG_NFSD_V3_ACL=y
266
229
CONFIG_NFSD_V4=y
267
230
CONFIG_CIFS=m
231
+
CONFIG_PARTITION_ADVANCED=y
268
232
CONFIG_NLS_CODEPAGE_437=y
269
233
CONFIG_NLS_CODEPAGE_1250=y
270
234
CONFIG_NLS_CODEPAGE_1251=y
···
274
234
CONFIG_NLS_ISO8859_1=y
275
235
CONFIG_NLS_ISO8859_15=y
276
236
CONFIG_NLS_UTF8=y
237
+
CONFIG_CRC_T10DIF=y
238
+
CONFIG_LIBCRC32C=m
277
239
CONFIG_MAGIC_SYSRQ=y
278
-
# CONFIG_UNUSED_SYMBOLS is not set
279
240
CONFIG_DEBUG_FS=y
280
241
CONFIG_DEBUG_KERNEL=y
281
242
CONFIG_DEBUG_MUTEXES=y
243
+
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
282
244
CONFIG_LATENCYTOP=y
283
-
CONFIG_STRICT_DEVMEM=y
245
+
CONFIG_SYSCTL_SYSCALL_CHECK=y
246
+
CONFIG_BOOTX_TEXT=y
284
247
CONFIG_CRYPTO_NULL=m
285
248
CONFIG_CRYPTO_TEST=m
249
+
CONFIG_CRYPTO_ECB=m
286
250
CONFIG_CRYPTO_PCBC=m
287
251
CONFIG_CRYPTO_HMAC=y
252
+
CONFIG_CRYPTO_MD4=m
288
253
CONFIG_CRYPTO_MICHAEL_MIC=m
289
254
CONFIG_CRYPTO_SHA256=m
290
255
CONFIG_CRYPTO_SHA512=m
291
256
CONFIG_CRYPTO_WP512=m
292
257
CONFIG_CRYPTO_AES=m
293
258
CONFIG_CRYPTO_ANUBIS=m
259
+
CONFIG_CRYPTO_ARC4=m
294
260
CONFIG_CRYPTO_BLOWFISH=m
295
261
CONFIG_CRYPTO_CAST5=m
296
262
CONFIG_CRYPTO_CAST6=m
···
306
260
CONFIG_CRYPTO_TWOFISH=m
307
261
# CONFIG_CRYPTO_ANSI_CPRNG is not set
308
262
# CONFIG_CRYPTO_HW is not set
309
-
# CONFIG_VIRTUALIZATION is not set
310
-
CONFIG_CRC_T10DIF=y
311
-
CONFIG_LIBCRC32C=m
+5
-13
arch/powerpc/configs/mpc83xx_defconfig
+5
-13
arch/powerpc/configs/mpc83xx_defconfig
···
2
2
CONFIG_SYSVIPC=y
3
3
CONFIG_LOG_BUF_SHIFT=14
4
4
CONFIG_BLK_DEV_INITRD=y
5
-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6
5
CONFIG_EXPERT=y
7
6
CONFIG_SLAB=y
8
7
CONFIG_MODULES=y
9
8
CONFIG_MODULE_UNLOAD=y
10
9
# CONFIG_BLK_DEV_BSG is not set
10
+
CONFIG_PARTITION_ADVANCED=y
11
11
# CONFIG_PPC_CHRP is not set
12
12
# CONFIG_PPC_PMAC is not set
13
13
CONFIG_PPC_83xx=y
···
25
25
CONFIG_QUICC_ENGINE=y
26
26
CONFIG_QE_GPIO=y
27
27
CONFIG_MATH_EMULATION=y
28
-
CONFIG_SPARSE_IRQ=y
29
28
CONFIG_PCI=y
30
29
CONFIG_NET=y
31
30
CONFIG_PACKET=y
···
41
42
# CONFIG_INET_LRO is not set
42
43
# CONFIG_IPV6 is not set
43
44
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45
+
CONFIG_DEVTMPFS=y
44
46
# CONFIG_FW_LOADER is not set
45
47
CONFIG_MTD=y
46
-
CONFIG_MTD_PARTITIONS=y
47
-
CONFIG_MTD_OF_PARTS=y
48
48
CONFIG_MTD_CHAR=y
49
49
CONFIG_MTD_BLOCK=y
50
50
CONFIG_MTD_CFI=y
···
62
64
CONFIG_SATA_FSL=y
63
65
CONFIG_SATA_SIL=y
64
66
CONFIG_NETDEVICES=y
67
+
CONFIG_MII=y
68
+
CONFIG_UCC_GETH=y
69
+
CONFIG_GIANFAR=y
65
70
CONFIG_MARVELL_PHY=y
66
71
CONFIG_DAVICOM_PHY=y
67
72
CONFIG_VITESSE_PHY=y
68
73
CONFIG_ICPLUS_PHY=y
69
74
CONFIG_FIXED_PHY=y
70
-
CONFIG_NET_ETHERNET=y
71
-
CONFIG_MII=y
72
-
CONFIG_GIANFAR=y
73
-
CONFIG_UCC_GETH=y
74
75
CONFIG_INPUT_FF_MEMLESS=m
75
76
# CONFIG_INPUT_MOUSEDEV is not set
76
77
# CONFIG_INPUT_KEYBOARD is not set
···
109
112
CONFIG_EXT2_FS=y
110
113
CONFIG_EXT3_FS=y
111
114
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
112
-
CONFIG_INOTIFY=y
113
115
CONFIG_PROC_KCORE=y
114
116
CONFIG_TMPFS=y
115
117
CONFIG_NFS_FS=y
116
-
CONFIG_NFS_V3=y
117
118
CONFIG_NFS_V4=y
118
119
CONFIG_ROOT_NFS=y
119
-
CONFIG_PARTITION_ADVANCED=y
120
120
CONFIG_CRC_T10DIF=y
121
-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
122
-
CONFIG_SYSCTL_SYSCALL_CHECK=y
123
121
CONFIG_CRYPTO_ECB=m
124
122
CONFIG_CRYPTO_PCBC=m
125
123
CONFIG_CRYPTO_SHA256=y
+9
-24
arch/powerpc/configs/mpc85xx_defconfig
+9
-24
arch/powerpc/configs/mpc85xx_defconfig
···
5
5
CONFIG_POSIX_MQUEUE=y
6
6
CONFIG_BSD_PROCESS_ACCT=y
7
7
CONFIG_AUDIT=y
8
-
CONFIG_SPARSE_IRQ=y
8
+
CONFIG_IRQ_DOMAIN_DEBUG=y
9
+
CONFIG_NO_HZ=y
10
+
CONFIG_HIGH_RES_TIMERS=y
9
11
CONFIG_IKCONFIG=y
10
12
CONFIG_IKCONFIG_PROC=y
11
13
CONFIG_LOG_BUF_SHIFT=14
···
19
17
CONFIG_MODULE_FORCE_UNLOAD=y
20
18
CONFIG_MODVERSIONS=y
21
19
# CONFIG_BLK_DEV_BSG is not set
20
+
CONFIG_PARTITION_ADVANCED=y
21
+
CONFIG_MAC_PARTITION=y
22
22
CONFIG_MPC8540_ADS=y
23
23
CONFIG_MPC8560_ADS=y
24
24
CONFIG_MPC85xx_CDS=y
···
44
40
CONFIG_QUICC_ENGINE=y
45
41
CONFIG_QE_GPIO=y
46
42
CONFIG_HIGHMEM=y
47
-
CONFIG_NO_HZ=y
48
-
CONFIG_HIGH_RES_TIMERS=y
49
43
CONFIG_BINFMT_MISC=m
50
44
CONFIG_MATH_EMULATION=y
51
45
CONFIG_FORCE_MAX_ZONEORDER=12
···
76
74
CONFIG_IPV6=y
77
75
CONFIG_IP_SCTP=m
78
76
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
77
+
CONFIG_DEVTMPFS=y
79
78
CONFIG_MTD=y
80
79
CONFIG_MTD_CMDLINE_PARTS=y
81
80
CONFIG_MTD_CHAR=y
82
81
CONFIG_MTD_BLOCK=y
83
-
CONFIG_MTD_CFI=y
84
82
CONFIG_FTL=y
85
-
CONFIG_MTD_GEN_PROBE=y
86
-
CONFIG_MTD_MAP_BANK_WIDTH_1=y
87
-
CONFIG_MTD_MAP_BANK_WIDTH_2=y
88
-
CONFIG_MTD_MAP_BANK_WIDTH_4=y
89
-
CONFIG_MTD_CFI_I1=y
90
-
CONFIG_MTD_CFI_I2=y
83
+
CONFIG_MTD_CFI=y
91
84
CONFIG_MTD_CFI_INTELEXT=y
92
85
CONFIG_MTD_CFI_AMDSTD=y
93
-
CONFIG_MTD_CFI_UTIL=y
94
86
CONFIG_MTD_PHYSMAP_OF=y
95
-
CONFIG_MTD_PARTITIONS=y
96
-
CONFIG_MTD_OF_PARTS=y
87
+
CONFIG_MTD_M25P80=y
97
88
CONFIG_MTD_NAND=y
98
89
CONFIG_MTD_NAND_FSL_ELBC=y
99
90
CONFIG_MTD_NAND_FSL_IFC=y
100
-
CONFIG_MTD_NAND_IDS=y
101
-
CONFIG_MTD_NAND_ECC=y
102
-
CONFIG_MTD_M25P80=y
103
91
CONFIG_PROC_DEVICETREE=y
104
92
CONFIG_BLK_DEV_LOOP=y
105
93
CONFIG_BLK_DEV_NBD=y
106
94
CONFIG_BLK_DEV_RAM=y
107
95
CONFIG_BLK_DEV_RAM_SIZE=131072
108
-
CONFIG_MISC_DEVICES=y
109
96
CONFIG_EEPROM_LEGACY=y
110
97
CONFIG_BLK_DEV_SD=y
111
98
CONFIG_CHR_DEV_ST=y
···
106
115
CONFIG_SATA_AHCI=y
107
116
CONFIG_SATA_FSL=y
108
117
CONFIG_PATA_ALI=y
118
+
CONFIG_PATA_VIA=y
109
119
CONFIG_NETDEVICES=y
110
120
CONFIG_DUMMY=y
111
121
CONFIG_FS_ENET=y
···
126
134
CONFIG_SERIAL_8250_CONSOLE=y
127
135
CONFIG_SERIAL_8250_NR_UARTS=2
128
136
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
129
-
CONFIG_SERIAL_8250_EXTENDED=y
130
137
CONFIG_SERIAL_8250_MANY_PORTS=y
131
138
CONFIG_SERIAL_8250_DETECT_IRQ=y
132
139
CONFIG_SERIAL_8250_RSA=y
···
174
183
CONFIG_HID_SONY=y
175
184
CONFIG_HID_SUNPLUS=y
176
185
CONFIG_USB=y
177
-
CONFIG_USB_DEVICEFS=y
178
186
CONFIG_USB_MON=y
179
187
CONFIG_USB_EHCI_HCD=y
180
188
CONFIG_USB_EHCI_FSL=y
···
219
229
CONFIG_SYSV_FS=m
220
230
CONFIG_UFS_FS=m
221
231
CONFIG_NFS_FS=y
222
-
CONFIG_NFS_V3=y
223
232
CONFIG_NFS_V4=y
224
233
CONFIG_ROOT_NFS=y
225
234
CONFIG_NFSD=y
226
-
CONFIG_PARTITION_ADVANCED=y
227
-
CONFIG_MAC_PARTITION=y
228
235
CONFIG_CRC_T10DIF=y
229
236
CONFIG_DEBUG_FS=y
230
237
CONFIG_DETECT_HUNG_TASK=y
231
238
CONFIG_DEBUG_INFO=y
232
-
CONFIG_SYSCTL_SYSCALL_CHECK=y
233
-
CONFIG_IRQ_DOMAIN_DEBUG=y
234
239
CONFIG_CRYPTO_PCBC=m
235
240
CONFIG_CRYPTO_SHA256=y
236
241
CONFIG_CRYPTO_SHA512=y
+8
-24
arch/powerpc/configs/mpc85xx_smp_defconfig
+8
-24
arch/powerpc/configs/mpc85xx_smp_defconfig
···
7
7
CONFIG_POSIX_MQUEUE=y
8
8
CONFIG_BSD_PROCESS_ACCT=y
9
9
CONFIG_AUDIT=y
10
-
CONFIG_SPARSE_IRQ=y
10
+
CONFIG_IRQ_DOMAIN_DEBUG=y
11
+
CONFIG_NO_HZ=y
12
+
CONFIG_HIGH_RES_TIMERS=y
11
13
CONFIG_IKCONFIG=y
12
14
CONFIG_IKCONFIG_PROC=y
13
15
CONFIG_LOG_BUF_SHIFT=14
···
21
19
CONFIG_MODULE_FORCE_UNLOAD=y
22
20
CONFIG_MODVERSIONS=y
23
21
# CONFIG_BLK_DEV_BSG is not set
22
+
CONFIG_PARTITION_ADVANCED=y
23
+
CONFIG_MAC_PARTITION=y
24
24
CONFIG_MPC8540_ADS=y
25
25
CONFIG_MPC8560_ADS=y
26
26
CONFIG_MPC85xx_CDS=y
···
46
42
CONFIG_QUICC_ENGINE=y
47
43
CONFIG_QE_GPIO=y
48
44
CONFIG_HIGHMEM=y
49
-
CONFIG_NO_HZ=y
50
-
CONFIG_HIGH_RES_TIMERS=y
51
45
CONFIG_BINFMT_MISC=m
52
46
CONFIG_MATH_EMULATION=y
53
47
CONFIG_IRQ_ALL_CPUS=y
···
79
77
CONFIG_IPV6=y
80
78
CONFIG_IP_SCTP=m
81
79
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
80
+
CONFIG_DEVTMPFS=y
82
81
CONFIG_MTD=y
83
82
CONFIG_MTD_CMDLINE_PARTS=y
84
83
CONFIG_MTD_CHAR=y
85
84
CONFIG_MTD_BLOCK=y
86
-
CONFIG_MTD_CFI=y
87
85
CONFIG_FTL=y
88
-
CONFIG_MTD_GEN_PROBE=y
89
-
CONFIG_MTD_MAP_BANK_WIDTH_1=y
90
-
CONFIG_MTD_MAP_BANK_WIDTH_2=y
91
-
CONFIG_MTD_MAP_BANK_WIDTH_4=y
92
-
CONFIG_MTD_CFI_I1=y
93
-
CONFIG_MTD_CFI_I2=y
86
+
CONFIG_MTD_CFI=y
94
87
CONFIG_MTD_CFI_INTELEXT=y
95
88
CONFIG_MTD_CFI_AMDSTD=y
96
-
CONFIG_MTD_CFI_UTIL=y
97
89
CONFIG_MTD_PHYSMAP_OF=y
98
-
CONFIG_MTD_PARTITIONS=y
99
-
CONFIG_MTD_OF_PARTS=y
90
+
CONFIG_MTD_M25P80=y
100
91
CONFIG_MTD_NAND=y
101
92
CONFIG_MTD_NAND_FSL_ELBC=y
102
93
CONFIG_MTD_NAND_FSL_IFC=y
103
-
CONFIG_MTD_NAND_IDS=y
104
-
CONFIG_MTD_NAND_ECC=y
105
-
CONFIG_MTD_M25P80=y
106
94
CONFIG_PROC_DEVICETREE=y
107
95
CONFIG_BLK_DEV_LOOP=y
108
96
CONFIG_BLK_DEV_NBD=y
109
97
CONFIG_BLK_DEV_RAM=y
110
98
CONFIG_BLK_DEV_RAM_SIZE=131072
111
-
CONFIG_MISC_DEVICES=y
112
99
CONFIG_EEPROM_LEGACY=y
113
100
CONFIG_BLK_DEV_SD=y
114
101
CONFIG_CHR_DEV_ST=y
···
128
137
CONFIG_SERIAL_8250_CONSOLE=y
129
138
CONFIG_SERIAL_8250_NR_UARTS=2
130
139
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
131
-
CONFIG_SERIAL_8250_EXTENDED=y
132
140
CONFIG_SERIAL_8250_MANY_PORTS=y
133
141
CONFIG_SERIAL_8250_DETECT_IRQ=y
134
142
CONFIG_SERIAL_8250_RSA=y
···
176
186
CONFIG_HID_SONY=y
177
187
CONFIG_HID_SUNPLUS=y
178
188
CONFIG_USB=y
179
-
CONFIG_USB_DEVICEFS=y
180
189
CONFIG_USB_MON=y
181
190
CONFIG_USB_EHCI_HCD=y
182
191
CONFIG_USB_EHCI_FSL=y
···
221
232
CONFIG_SYSV_FS=m
222
233
CONFIG_UFS_FS=m
223
234
CONFIG_NFS_FS=y
224
-
CONFIG_NFS_V3=y
225
235
CONFIG_NFS_V4=y
226
236
CONFIG_ROOT_NFS=y
227
237
CONFIG_NFSD=y
228
-
CONFIG_PARTITION_ADVANCED=y
229
-
CONFIG_MAC_PARTITION=y
230
238
CONFIG_CRC_T10DIF=y
231
239
CONFIG_DEBUG_FS=y
232
240
CONFIG_DETECT_HUNG_TASK=y
233
241
CONFIG_DEBUG_INFO=y
234
-
CONFIG_SYSCTL_SYSCALL_CHECK=y
235
-
CONFIG_IRQ_DOMAIN_DEBUG=y
236
242
CONFIG_CRYPTO_PCBC=m
237
243
CONFIG_CRYPTO_SHA256=y
238
244
CONFIG_CRYPTO_SHA512=y
-2
arch/powerpc/include/asm/cputable.h
-2
arch/powerpc/include/asm/cputable.h
+1
arch/powerpc/include/asm/mpic_msgr.h
+1
arch/powerpc/include/asm/mpic_msgr.h
+4
-5
arch/powerpc/kernel/dma-iommu.c
+4
-5
arch/powerpc/kernel/dma-iommu.c
···
83
83
return 0;
84
84
}
85
85
86
-
if ((tbl->it_offset + tbl->it_size) > (mask >> IOMMU_PAGE_SHIFT)) {
87
-
dev_info(dev, "Warning: IOMMU window too big for device mask\n");
88
-
dev_info(dev, "mask: 0x%08llx, table end: 0x%08lx\n",
89
-
mask, (tbl->it_offset + tbl->it_size) <<
90
-
IOMMU_PAGE_SHIFT);
86
+
if (tbl->it_offset > (mask >> IOMMU_PAGE_SHIFT)) {
87
+
dev_info(dev, "Warning: IOMMU offset too big for device mask\n");
88
+
dev_info(dev, "mask: 0x%08llx, table offset: 0x%08lx\n",
89
+
mask, tbl->it_offset << IOMMU_PAGE_SHIFT);
91
90
return 0;
92
91
} else
93
92
return 1;
+1
-1
arch/powerpc/kernel/hw_breakpoint.c
+1
-1
arch/powerpc/kernel/hw_breakpoint.c
+24
-3
arch/powerpc/kernel/kgdb.c
+24
-3
arch/powerpc/kernel/kgdb.c
···
25
25
#include <asm/processor.h>
26
26
#include <asm/machdep.h>
27
27
#include <asm/debug.h>
28
+
#include <linux/slab.h>
28
29
29
30
/*
30
31
* This table contains the mapping between PowerPC hardware trap types, and
···
102
101
return SIGHUP; /* default for things we don't know about */
103
102
}
104
103
104
+
/**
105
+
*
106
+
* kgdb_skipexception - Bail out of KGDB when we've been triggered.
107
+
* @exception: Exception vector number
108
+
* @regs: Current &struct pt_regs.
109
+
*
110
+
* On some architectures we need to skip a breakpoint exception when
111
+
* it occurs after a breakpoint has been removed.
112
+
*
113
+
*/
114
+
int kgdb_skipexception(int exception, struct pt_regs *regs)
115
+
{
116
+
return kgdb_isremovedbreak(regs->nip);
117
+
}
118
+
105
119
static int kgdb_call_nmi_hook(struct pt_regs *regs)
106
120
{
107
121
kgdb_nmicallback(raw_smp_processor_id(), regs);
···
154
138
static int kgdb_singlestep(struct pt_regs *regs)
155
139
{
156
140
struct thread_info *thread_info, *exception_thread_info;
141
+
struct thread_info *backup_current_thread_info = \
142
+
(struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL);
157
143
158
144
if (user_mode(regs))
159
145
return 0;
···
173
155
thread_info = (struct thread_info *)(regs->gpr[1] & ~(THREAD_SIZE-1));
174
156
exception_thread_info = current_thread_info();
175
157
176
-
if (thread_info != exception_thread_info)
158
+
if (thread_info != exception_thread_info) {
159
+
/* Save the original current_thread_info. */
160
+
memcpy(backup_current_thread_info, exception_thread_info, sizeof *thread_info);
177
161
memcpy(exception_thread_info, thread_info, sizeof *thread_info);
162
+
}
178
163
179
164
kgdb_handle_exception(0, SIGTRAP, 0, regs);
180
165
181
166
if (thread_info != exception_thread_info)
182
-
memcpy(thread_info, exception_thread_info, sizeof *thread_info);
167
+
/* Restore current_thread_info lastly. */
168
+
memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info);
183
169
184
170
return 1;
185
171
}
···
432
410
#else
433
411
linux_regs->msr |= MSR_SE;
434
412
#endif
435
-
kgdb_single_step = 1;
436
413
atomic_set(&kgdb_cpu_doing_single_step,
437
414
raw_smp_processor_id());
438
415
}
+4
-4
arch/powerpc/kernel/syscalls.c
+4
-4
arch/powerpc/kernel/syscalls.c
···
107
107
long ret;
108
108
109
109
if (personality(current->personality) == PER_LINUX32
110
-
&& personality == PER_LINUX)
111
-
personality = PER_LINUX32;
110
+
&& personality(personality) == PER_LINUX)
111
+
personality = (personality & ~PER_MASK) | PER_LINUX32;
112
112
ret = sys_personality(personality);
113
-
if (ret == PER_LINUX32)
114
-
ret = PER_LINUX;
113
+
if (personality(ret) == PER_LINUX32)
114
+
ret = (ret & ~PER_MASK) | PER_LINUX;
115
115
return ret;
116
116
}
117
117
#endif
+2
-33
arch/powerpc/lib/copyuser_power7.S
+2
-33
arch/powerpc/lib/copyuser_power7.S
···
288
288
std r0,16(r1)
289
289
stdu r1,-STACKFRAMESIZE(r1)
290
290
bl .enter_vmx_usercopy
291
-
cmpwi r3,0
291
+
cmpwi cr1,r3,0
292
292
ld r0,STACKFRAMESIZE+16(r1)
293
293
ld r3,STACKFRAMESIZE+48(r1)
294
294
ld r4,STACKFRAMESIZE+56(r1)
···
326
326
dcbt r0,r8,0b01010 /* GO */
327
327
.machine pop
328
328
329
-
/*
330
-
* We prefetch both the source and destination using enhanced touch
331
-
* instructions. We use a stream ID of 0 for the load side and
332
-
* 1 for the store side.
333
-
*/
334
-
clrrdi r6,r4,7
335
-
clrrdi r9,r3,7
336
-
ori r9,r9,1 /* stream=1 */
337
-
338
-
srdi r7,r5,7 /* length in cachelines, capped at 0x3FF */
339
-
cmpldi cr1,r7,0x3FF
340
-
ble cr1,1f
341
-
li r7,0x3FF
342
-
1: lis r0,0x0E00 /* depth=7 */
343
-
sldi r7,r7,7
344
-
or r7,r7,r0
345
-
ori r10,r7,1 /* stream=1 */
346
-
347
-
lis r8,0x8000 /* GO=1 */
348
-
clrldi r8,r8,32
349
-
350
-
.machine push
351
-
.machine "power4"
352
-
dcbt r0,r6,0b01000
353
-
dcbt r0,r7,0b01010
354
-
dcbtst r0,r9,0b01000
355
-
dcbtst r0,r10,0b01010
356
-
eieio
357
-
dcbt r0,r8,0b01010 /* GO */
358
-
.machine pop
359
-
360
-
beq .Lunwind_stack_nonvmx_copy
329
+
beq cr1,.Lunwind_stack_nonvmx_copy
361
330
362
331
/*
363
332
* If source and destination are not relatively aligned we use a
+2
-2
arch/powerpc/lib/memcpy_power7.S
+2
-2
arch/powerpc/lib/memcpy_power7.S
···
222
222
std r0,16(r1)
223
223
stdu r1,-STACKFRAMESIZE(r1)
224
224
bl .enter_vmx_copy
225
-
cmpwi r3,0
225
+
cmpwi cr1,r3,0
226
226
ld r0,STACKFRAMESIZE+16(r1)
227
227
ld r3,STACKFRAMESIZE+48(r1)
228
228
ld r4,STACKFRAMESIZE+56(r1)
···
260
260
dcbt r0,r8,0b01010 /* GO */
261
261
.machine pop
262
262
263
-
beq .Lunwind_stack_nonvmx_copy
263
+
beq cr1,.Lunwind_stack_nonvmx_copy
264
264
265
265
/*
266
266
* If source and destination are not relatively aligned we use a
+1
-1
arch/powerpc/perf/core-book3s.c
+1
-1
arch/powerpc/perf/core-book3s.c
+8
-5
arch/powerpc/sysdev/fsl_pci.c
+8
-5
arch/powerpc/sysdev/fsl_pci.c
···
465
465
iounmap(hose->cfg_data);
466
466
iounmap(hose->cfg_addr);
467
467
pcibios_free_controller(hose);
468
-
return 0;
468
+
return -ENODEV;
469
469
}
470
470
471
471
setup_pci_cmd(hose);
···
827
827
828
828
void __devinit fsl_pci_init(void)
829
829
{
830
+
int ret;
830
831
struct device_node *node;
831
832
struct pci_controller *hose;
832
833
dma_addr_t max = 0xffffffff;
···
856
855
if (!fsl_pci_primary)
857
856
fsl_pci_primary = node;
858
857
859
-
fsl_add_bridge(node, fsl_pci_primary == node);
860
-
hose = pci_find_hose_for_OF_device(node);
861
-
max = min(max, hose->dma_window_base_cur +
862
-
hose->dma_window_size);
858
+
ret = fsl_add_bridge(node, fsl_pci_primary == node);
859
+
if (ret == 0) {
860
+
hose = pci_find_hose_for_OF_device(node);
861
+
max = min(max, hose->dma_window_base_cur +
862
+
hose->dma_window_size);
863
+
}
863
864
}
864
865
}
865
866
+3
arch/powerpc/sysdev/mpic_msgr.c
+3
arch/powerpc/sysdev/mpic_msgr.c
+30
-46
arch/powerpc/xmon/xmon.c
+30
-46
arch/powerpc/xmon/xmon.c
···
17
17
#include <linux/reboot.h>
18
18
#include <linux/delay.h>
19
19
#include <linux/kallsyms.h>
20
+
#include <linux/kmsg_dump.h>
20
21
#include <linux/cpumask.h>
21
22
#include <linux/export.h>
22
23
#include <linux/sysrq.h>
···
895
894
#endif
896
895
default:
897
896
printf("Unrecognized command: ");
898
-
do {
897
+
do {
899
898
if (' ' < cmd && cmd <= '~')
900
899
putchar(cmd);
901
900
else
902
901
printf("\\x%x", cmd);
903
902
cmd = inchar();
904
-
} while (cmd != '\n');
903
+
} while (cmd != '\n');
905
904
printf(" (type ? for help)\n");
906
905
break;
907
906
}
···
1098
1097
return 1;
1099
1098
}
1100
1099
1101
-
static char *breakpoint_help_string =
1100
+
static char *breakpoint_help_string =
1102
1101
"Breakpoint command usage:\n"
1103
1102
"b show breakpoints\n"
1104
1103
"b <addr> [cnt] set breakpoint at given instr addr\n"
···
1194
1193
1195
1194
default:
1196
1195
termch = cmd;
1197
-
cmd = skipbl();
1196
+
cmd = skipbl();
1198
1197
if (cmd == '?') {
1199
1198
printf(breakpoint_help_string);
1200
1199
break;
···
1360
1359
sp + REGS_OFFSET);
1361
1360
break;
1362
1361
}
1363
-
printf("--- Exception: %lx %s at ", regs.trap,
1362
+
printf("--- Exception: %lx %s at ", regs.trap,
1364
1363
getvecname(TRAP(®s)));
1365
1364
pc = regs.nip;
1366
1365
lr = regs.link;
···
1624
1623
1625
1624
cmd = skipbl();
1626
1625
if (cmd == '\n') {
1627
-
unsigned long sp, toc;
1626
+
unsigned long sp, toc;
1628
1627
asm("mr %0,1" : "=r" (sp) :);
1629
1628
asm("mr %0,2" : "=r" (toc) :);
1630
1629
1631
1630
printf("msr = "REG" sprg0= "REG"\n",
1632
1631
mfmsr(), mfspr(SPRN_SPRG0));
1633
1632
printf("pvr = "REG" sprg1= "REG"\n",
1634
-
mfspr(SPRN_PVR), mfspr(SPRN_SPRG1));
1633
+
mfspr(SPRN_PVR), mfspr(SPRN_SPRG1));
1635
1634
printf("dec = "REG" sprg2= "REG"\n",
1636
1635
mfspr(SPRN_DEC), mfspr(SPRN_SPRG2));
1637
1636
printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3));
···
1784
1783
static int brev;
1785
1784
static int mnoread;
1786
1785
1787
-
static char *memex_help_string =
1786
+
static char *memex_help_string =
1788
1787
"Memory examine command usage:\n"
1789
1788
"m [addr] [flags] examine/change memory\n"
1790
1789
" addr is optional. will start where left off.\n"
···
1799
1798
"NOTE: flags are saved as defaults\n"
1800
1799
"";
1801
1800
1802
-
static char *memex_subcmd_help_string =
1801
+
static char *memex_subcmd_help_string =
1803
1802
"Memory examine subcommands:\n"
1804
1803
" hexval write this val to current location\n"
1805
1804
" 'string' write chars from string to this location\n"
···
2065
2064
nr = mread(adrs, temp, r);
2066
2065
adrs += nr;
2067
2066
for (m = 0; m < r; ++m) {
2068
-
if ((m & (sizeof(long) - 1)) == 0 && m > 0)
2067
+
if ((m & (sizeof(long) - 1)) == 0 && m > 0)
2069
2068
putchar(' ');
2070
2069
if (m < nr)
2071
2070
printf("%.2x", temp[m]);
···
2073
2072
printf("%s", fault_chars[fault_type]);
2074
2073
}
2075
2074
for (; m < 16; ++m) {
2076
-
if ((m & (sizeof(long) - 1)) == 0)
2075
+
if ((m & (sizeof(long) - 1)) == 0)
2077
2076
putchar(' ');
2078
2077
printf(" ");
2079
2078
}
···
2149
2148
void
2150
2149
dump_log_buf(void)
2151
2150
{
2152
-
const unsigned long size = 128;
2153
-
unsigned long end, addr;
2154
-
unsigned char buf[size + 1];
2151
+
struct kmsg_dumper dumper = { .active = 1 };
2152
+
unsigned char buf[128];
2153
+
size_t len;
2155
2154
2156
-
addr = 0;
2157
-
buf[size] = '\0';
2155
+
if (setjmp(bus_error_jmp) != 0) {
2156
+
printf("Error dumping printk buffer!\n");
2157
+
return;
2158
+
}
2158
2159
2159
-
if (setjmp(bus_error_jmp) != 0) {
2160
-
printf("Unable to lookup symbol __log_buf!\n");
2161
-
return;
2162
-
}
2160
+
catch_memory_errors = 1;
2161
+
sync();
2163
2162
2164
-
catch_memory_errors = 1;
2165
-
sync();
2166
-
addr = kallsyms_lookup_name("__log_buf");
2163
+
kmsg_dump_rewind_nolock(&dumper);
2164
+
while (kmsg_dump_get_line_nolock(&dumper, false, buf, sizeof(buf), &len)) {
2165
+
buf[len] = '\0';
2166
+
printf("%s", buf);
2167
+
}
2167
2168
2168
-
if (! addr)
2169
-
printf("Symbol __log_buf not found!\n");
2170
-
else {
2171
-
end = addr + (1 << CONFIG_LOG_BUF_SHIFT);
2172
-
while (addr < end) {
2173
-
if (! mread(addr, buf, size)) {
2174
-
printf("Can't read memory at address 0x%lx\n", addr);
2175
-
break;
2176
-
}
2177
-
2178
-
printf("%s", buf);
2179
-
2180
-
if (strlen(buf) < size)
2181
-
break;
2182
-
2183
-
addr += size;
2184
-
}
2185
-
}
2186
-
2187
-
sync();
2188
-
/* wait a little while to see if we get a machine check */
2189
-
__delay(200);
2190
-
catch_memory_errors = 0;
2169
+
sync();
2170
+
/* wait a little while to see if we get a machine check */
2171
+
__delay(200);
2172
+
catch_memory_errors = 0;
2191
2173
}
2192
2174
2193
2175
/*
+3
-4
drivers/watchdog/booke_wdt.c
+3
-4
drivers/watchdog/booke_wdt.c
···
166
166
167
167
switch (cmd) {
168
168
case WDIOC_GETSUPPORT:
169
-
if (copy_to_user((void *)arg, &ident, sizeof(ident)))
170
-
return -EFAULT;
169
+
return copy_to_user(p, &ident, sizeof(ident)) ? -EFAULT : 0;
171
170
case WDIOC_GETSTATUS:
172
171
return put_user(0, p);
173
172
case WDIOC_GETBOOTSTATUS:
174
173
/* XXX: something is clearing TSR */
175
174
tmp = mfspr(SPRN_TSR) & TSR_WRS(3);
176
175
/* returns CARDRESET if last reset was caused by the WDT */
177
-
return (tmp ? WDIOF_CARDRESET : 0);
176
+
return put_user((tmp ? WDIOF_CARDRESET : 0), p);
178
177
case WDIOC_SETOPTIONS:
179
178
if (get_user(tmp, p))
180
-
return -EINVAL;
179
+
return -EFAULT;
181
180
if (tmp == WDIOS_ENABLECARD) {
182
181
booke_wdt_ping();
183
182
break;