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/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix SLB initialization at boot time
[POWERPC] Fix undefined reference to device_power_up/resume
[POWERPC] cell: Update cell_defconfig for 2.6.23
[POWERPC] axonram: Do not delete gendisks queue in error path
[POWERPC] axonram: Module modification for latest firmware API changes
[POWERPC] cell: Support pinhole-reset on IBM cell blades
[POWERPC] spu_manage: Use newer physical-id attribute
[POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE
+172
-218
+78
-146
arch/powerpc/configs/cell_defconfig
+78
-146
arch/powerpc/configs/cell_defconfig
···
1
1
#
2
2
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.22-rc6
4
-
# Tue Jun 26 12:32:34 2007
3
+
# Linux kernel version: 2.6.23-rc3
4
+
# Wed Aug 22 15:19:19 2007
5
5
#
6
6
CONFIG_PPC64=y
7
+
8
+
#
9
+
# Processor support
10
+
#
11
+
# CONFIG_POWER4_ONLY is not set
12
+
CONFIG_POWER3=y
13
+
CONFIG_POWER4=y
14
+
CONFIG_PPC_FPU=y
15
+
CONFIG_ALTIVEC=y
16
+
CONFIG_PPC_STD_MMU=y
17
+
CONFIG_PPC_MM_SLICES=y
18
+
CONFIG_VIRT_CPU_ACCOUNTING=y
19
+
CONFIG_SMP=y
20
+
CONFIG_NR_CPUS=4
7
21
CONFIG_64BIT=y
8
22
CONFIG_PPC_MERGE=y
9
23
CONFIG_MMU=y
···
29
15
CONFIG_GENERIC_HWEIGHT=y
30
16
CONFIG_GENERIC_CALIBRATE_DELAY=y
31
17
CONFIG_GENERIC_FIND_NEXT_BIT=y
18
+
CONFIG_ARCH_NO_VIRT_TO_BUS=y
32
19
CONFIG_PPC=y
33
20
CONFIG_EARLY_PRINTK=y
34
21
CONFIG_COMPAT=y
···
37
22
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
38
23
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
39
24
CONFIG_PPC_OF=y
25
+
CONFIG_OF=y
40
26
CONFIG_PPC_UDBG_16550=y
41
27
# CONFIG_GENERIC_TBSYNC is not set
42
28
CONFIG_AUDIT_ARCH=y
43
29
CONFIG_GENERIC_BUG=y
44
30
# CONFIG_DEFAULT_UIMAGE is not set
45
-
46
-
#
47
-
# Processor support
48
-
#
49
-
# CONFIG_POWER4_ONLY is not set
50
-
CONFIG_POWER3=y
51
-
CONFIG_POWER4=y
52
-
CONFIG_PPC_FPU=y
53
31
# CONFIG_PPC_DCR_NATIVE is not set
54
32
CONFIG_PPC_DCR_MMIO=y
55
33
CONFIG_PPC_DCR=y
56
34
CONFIG_PPC_OF_PLATFORM_PCI=y
57
-
CONFIG_ALTIVEC=y
58
-
CONFIG_PPC_STD_MMU=y
59
-
CONFIG_PPC_MM_SLICES=y
60
-
CONFIG_VIRT_CPU_ACCOUNTING=y
61
-
CONFIG_SMP=y
62
-
CONFIG_NR_CPUS=4
63
35
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
64
-
65
-
#
66
-
# Code maturity level options
67
-
#
68
-
CONFIG_EXPERIMENTAL=y
69
-
CONFIG_LOCK_KERNEL=y
70
-
CONFIG_INIT_ENV_ARG_LIMIT=32
71
36
72
37
#
73
38
# General setup
74
39
#
40
+
CONFIG_EXPERIMENTAL=y
41
+
CONFIG_LOCK_KERNEL=y
42
+
CONFIG_INIT_ENV_ARG_LIMIT=32
75
43
CONFIG_LOCALVERSION=""
76
44
CONFIG_LOCALVERSION_AUTO=y
77
45
CONFIG_SWAP=y
78
46
CONFIG_SYSVIPC=y
79
-
# CONFIG_IPC_NS is not set
80
47
CONFIG_SYSVIPC_SYSCTL=y
81
48
# CONFIG_POSIX_MQUEUE is not set
82
49
# CONFIG_BSD_PROCESS_ACCT is not set
83
50
# CONFIG_TASKSTATS is not set
84
-
# CONFIG_UTS_NS is not set
51
+
# CONFIG_USER_NS is not set
85
52
# CONFIG_AUDIT is not set
86
53
CONFIG_IKCONFIG=y
87
54
CONFIG_IKCONFIG_PROC=y
···
93
96
CONFIG_EVENTFD=y
94
97
CONFIG_SHMEM=y
95
98
CONFIG_VM_EVENT_COUNTERS=y
96
-
CONFIG_SLAB=y
97
-
# CONFIG_SLUB is not set
99
+
CONFIG_SLUB_DEBUG=y
100
+
# CONFIG_SLAB is not set
101
+
CONFIG_SLUB=y
98
102
# CONFIG_SLOB is not set
99
103
CONFIG_RT_MUTEXES=y
100
104
# CONFIG_TINY_SHMEM is not set
101
105
CONFIG_BASE_SMALL=0
102
-
103
-
#
104
-
# Loadable module support
105
-
#
106
106
CONFIG_MODULES=y
107
107
CONFIG_MODULE_UNLOAD=y
108
108
# CONFIG_MODULE_FORCE_UNLOAD is not set
···
107
113
# CONFIG_MODULE_SRCVERSION_ALL is not set
108
114
CONFIG_KMOD=y
109
115
CONFIG_STOP_MACHINE=y
110
-
111
-
#
112
-
# Block layer
113
-
#
114
116
CONFIG_BLOCK=y
115
117
# CONFIG_BLK_DEV_IO_TRACE is not set
118
+
# CONFIG_BLK_DEV_BSG is not set
116
119
117
120
#
118
121
# IO Schedulers
···
129
138
#
130
139
CONFIG_PPC_MULTIPLATFORM=y
131
140
# CONFIG_EMBEDDED6xx is not set
132
-
# CONFIG_APUS is not set
141
+
# CONFIG_PPC_82xx is not set
142
+
# CONFIG_PPC_83xx is not set
143
+
# CONFIG_PPC_86xx is not set
133
144
# CONFIG_PPC_PSERIES is not set
134
145
# CONFIG_PPC_ISERIES is not set
135
146
# CONFIG_PPC_MPC52xx is not set
···
151
158
CONFIG_PS3_USE_LPAR_ADDR=y
152
159
CONFIG_PS3_VUART=y
153
160
CONFIG_PS3_PS3AV=y
154
-
CONFIG_PS3_SYS_MANAGER=y
161
+
CONFIG_PS3_SYS_MANAGER=m
162
+
CONFIG_PS3_STORAGE=y
163
+
CONFIG_PS3_DISK=y
164
+
CONFIG_PS3_ROM=m
165
+
CONFIG_PS3_FLASH=m
155
166
CONFIG_PPC_CELL=y
156
167
CONFIG_PPC_CELL_NATIVE=y
157
168
CONFIG_PPC_IBM_CELL_BLADE=y
···
168
171
CONFIG_CBE_RAS=y
169
172
CONFIG_CBE_THERM=m
170
173
CONFIG_CBE_CPUFREQ=m
174
+
CONFIG_CBE_CPUFREQ_PMI=m
171
175
# CONFIG_PQ2ADS is not set
172
176
CONFIG_PPC_NATIVE=y
173
177
CONFIG_UDBG_RTAS_CONSOLE=y
···
181
183
# CONFIG_RTAS_ERROR_LOGGING is not set
182
184
CONFIG_RTAS_PROC=y
183
185
CONFIG_RTAS_FLASH=y
184
-
# CONFIG_PPC_PMI is not set
186
+
CONFIG_PPC_PMI=m
185
187
CONFIG_MMIO_NVRAM=y
186
188
# CONFIG_PPC_MPC106 is not set
187
189
# CONFIG_PPC_970_NAP is not set
···
204
206
# CPU Frequency drivers
205
207
#
206
208
# CONFIG_CPM2 is not set
209
+
CONFIG_AXON_RAM=m
210
+
# CONFIG_FSL_ULI1575 is not set
207
211
208
212
#
209
213
# Kernel options
···
248
248
CONFIG_MIGRATION=y
249
249
CONFIG_RESOURCES_64BIT=y
250
250
CONFIG_ZONE_DMA_FLAG=1
251
+
CONFIG_BOUNCE=y
251
252
CONFIG_ARCH_MEMORY_PROBE=y
252
253
CONFIG_NODES_SPAN_OTHER_NODES=y
253
254
CONFIG_PPC_HAS_HASH_64K=y
···
269
268
# CONFIG_PPC_INDIRECT_PCI is not set
270
269
CONFIG_PCI=y
271
270
CONFIG_PCI_DOMAINS=y
271
+
CONFIG_PCI_SYSCALL=y
272
272
CONFIG_PCIEPORTBUS=y
273
+
CONFIG_PCIEAER=y
273
274
CONFIG_ARCH_SUPPORTS_MSI=y
274
275
# CONFIG_PCI_MSI is not set
275
276
# CONFIG_PCI_DEBUG is not set
···
362
359
CONFIG_NETFILTER_XT_TARGET_MARK=m
363
360
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
364
361
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
362
+
# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
365
363
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
366
364
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
367
365
CONFIG_NETFILTER_XT_MATCH_DCCP=m
···
381
377
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
382
378
CONFIG_NETFILTER_XT_MATCH_STRING=m
383
379
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
380
+
CONFIG_NETFILTER_XT_MATCH_U32=m
384
381
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
385
382
386
383
#
···
453
448
# CONFIG_MAC80211 is not set
454
449
# CONFIG_IEEE80211 is not set
455
450
# CONFIG_RFKILL is not set
451
+
# CONFIG_NET_9P is not set
456
452
457
453
#
458
454
# Device Drivers
···
468
462
# CONFIG_DEBUG_DRIVER is not set
469
463
# CONFIG_DEBUG_DEVRES is not set
470
464
# CONFIG_SYS_HYPERVISOR is not set
471
-
472
-
#
473
-
# Connector - unified userspace <-> kernelspace linker
474
-
#
475
465
# CONFIG_CONNECTOR is not set
476
466
# CONFIG_MTD is not set
477
-
478
-
#
479
-
# Parallel port support
480
-
#
467
+
CONFIG_OF_DEVICE=y
481
468
# CONFIG_PARPORT is not set
482
-
483
-
#
484
-
# Plug and Play support
485
-
#
486
-
# CONFIG_PNPACPI is not set
487
-
488
-
#
489
-
# Block devices
490
-
#
469
+
CONFIG_BLK_DEV=y
491
470
# CONFIG_BLK_DEV_FD is not set
492
-
# CONFIG_BLK_CPQ_DA is not set
493
471
# CONFIG_BLK_CPQ_CISS_DA is not set
494
472
# CONFIG_BLK_DEV_DAC960 is not set
495
473
# CONFIG_BLK_DEV_UMEM is not set
···
489
499
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
490
500
# CONFIG_CDROM_PKTCDVD is not set
491
501
# CONFIG_ATA_OVER_ETH is not set
492
-
493
-
#
494
-
# Misc devices
495
-
#
502
+
CONFIG_MISC_DEVICES=y
496
503
# CONFIG_PHANTOM is not set
504
+
# CONFIG_EEPROM_93CX6 is not set
497
505
# CONFIG_SGI_IOC4 is not set
498
506
# CONFIG_TIFM_CORE is not set
499
-
# CONFIG_BLINK is not set
500
507
CONFIG_IDE=y
501
508
CONFIG_BLK_DEV_IDE=y
502
509
···
559
572
#
560
573
# CONFIG_RAID_ATTRS is not set
561
574
CONFIG_SCSI=y
575
+
CONFIG_SCSI_DMA=y
562
576
# CONFIG_SCSI_TGT is not set
563
577
# CONFIG_SCSI_NETLINK is not set
564
578
CONFIG_SCSI_PROC_FS=y
···
592
604
# CONFIG_SCSI_ISCSI_ATTRS is not set
593
605
CONFIG_SCSI_SAS_ATTRS=y
594
606
# CONFIG_SCSI_SAS_LIBSAS is not set
595
-
596
-
#
597
-
# SCSI low-level drivers
598
-
#
607
+
CONFIG_SCSI_LOWLEVEL=y
599
608
# CONFIG_ISCSI_TCP is not set
600
609
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
601
610
# CONFIG_SCSI_3W_9XXX is not set
···
607
622
# CONFIG_MEGARAID_LEGACY is not set
608
623
# CONFIG_MEGARAID_SAS is not set
609
624
# CONFIG_SCSI_HPTIOP is not set
610
-
# CONFIG_SCSI_BUSLOGIC is not set
611
625
# CONFIG_SCSI_DMX3191D is not set
612
626
# CONFIG_SCSI_EATA is not set
613
627
# CONFIG_SCSI_FUTURE_DOMAIN is not set
···
680
696
# CONFIG_PATA_VIA is not set
681
697
# CONFIG_PATA_WINBOND is not set
682
698
# CONFIG_PATA_SCC is not set
683
-
684
-
#
685
-
# Multi-device support (RAID and LVM)
686
-
#
687
699
CONFIG_MD=y
688
700
CONFIG_BLK_DEV_MD=m
689
701
CONFIG_MD_LINEAR=m
···
697
717
CONFIG_DM_ZERO=m
698
718
CONFIG_DM_MULTIPATH=m
699
719
# CONFIG_DM_MULTIPATH_EMC is not set
720
+
# CONFIG_DM_MULTIPATH_RDAC is not set
700
721
# CONFIG_DM_DELAY is not set
701
722
702
723
#
···
709
728
CONFIG_FUSION_SAS=y
710
729
CONFIG_FUSION_MAX_SGE=128
711
730
# CONFIG_FUSION_CTL is not set
731
+
# CONFIG_FUSION_LOGGING is not set
712
732
713
733
#
714
734
# IEEE 1394 (FireWire) support
715
735
#
716
736
# CONFIG_FIREWIRE is not set
717
737
# CONFIG_IEEE1394 is not set
718
-
719
-
#
720
-
# I2O device support
721
-
#
722
738
# CONFIG_I2O is not set
723
739
# CONFIG_MACINTOSH_DRIVERS is not set
724
-
725
-
#
726
-
# Network device support
727
-
#
728
740
CONFIG_NETDEVICES=y
741
+
# CONFIG_NETDEVICES_MULTIQUEUE is not set
729
742
# CONFIG_DUMMY is not set
730
743
CONFIG_BONDING=m
744
+
CONFIG_MACVLAN=m
731
745
# CONFIG_EQUALIZER is not set
732
746
CONFIG_TUN=y
733
747
# CONFIG_ARCNET is not set
734
748
# CONFIG_PHYLIB is not set
735
-
736
-
#
737
-
# Ethernet (10 or 100Mbit)
738
-
#
739
749
CONFIG_NET_ETHERNET=y
740
750
CONFIG_MII=y
741
751
# CONFIG_HAPPYMEAL is not set
742
752
# CONFIG_SUNGEM is not set
743
753
# CONFIG_CASSINI is not set
744
754
# CONFIG_NET_VENDOR_3COM is not set
745
-
746
-
#
747
-
# Tulip family network device support
748
-
#
749
755
# CONFIG_NET_TULIP is not set
750
756
# CONFIG_HP100 is not set
751
757
# CONFIG_NET_PCI is not set
···
749
781
# CONFIG_SIS190 is not set
750
782
CONFIG_SKGE=m
751
783
CONFIG_SKY2=m
752
-
# CONFIG_SK98LIN is not set
784
+
# CONFIG_SKY2_DEBUG is not set
753
785
# CONFIG_VIA_VELOCITY is not set
754
786
CONFIG_TIGON3=y
755
787
# CONFIG_BNX2 is not set
756
788
CONFIG_SPIDER_NET=y
789
+
CONFIG_GELIC_NET=m
757
790
# CONFIG_QLA3XXX is not set
758
791
# CONFIG_ATL1 is not set
759
792
CONFIG_NETDEV_10000=y
···
793
824
# CONFIG_NETCONSOLE is not set
794
825
# CONFIG_NETPOLL is not set
795
826
# CONFIG_NET_POLL_CONTROLLER is not set
796
-
797
-
#
798
-
# ISDN subsystem
799
-
#
800
827
# CONFIG_ISDN is not set
801
-
802
-
#
803
-
# Telephony Support
804
-
#
805
828
# CONFIG_PHONE is not set
806
829
807
830
#
···
886
925
CONFIG_HVC_DRIVER=y
887
926
CONFIG_HVC_RTAS=y
888
927
CONFIG_HVC_BEAT=y
889
-
890
-
#
891
-
# IPMI
892
-
#
893
928
CONFIG_IPMI_HANDLER=m
894
929
# CONFIG_IPMI_PANIC_EVENT is not set
895
930
CONFIG_IPMI_DEVICE_INTERFACE=m
···
920
963
# CONFIG_DRM is not set
921
964
# CONFIG_RAW_DRIVER is not set
922
965
# CONFIG_HANGCHECK_TIMER is not set
923
-
924
-
#
925
-
# TPM devices
926
-
#
927
966
# CONFIG_TCG_TPM is not set
928
967
CONFIG_DEVPORT=y
929
968
CONFIG_I2C=y
···
953
1000
# CONFIG_I2C_SIS5595 is not set
954
1001
# CONFIG_I2C_SIS630 is not set
955
1002
# CONFIG_I2C_SIS96X is not set
1003
+
# CONFIG_I2C_TAOS_EVM is not set
956
1004
# CONFIG_I2C_STUB is not set
957
1005
# CONFIG_I2C_TINY_USB is not set
958
1006
# CONFIG_I2C_VIA is not set
···
965
1011
#
966
1012
# CONFIG_SENSORS_DS1337 is not set
967
1013
# CONFIG_SENSORS_DS1374 is not set
1014
+
# CONFIG_DS1682 is not set
968
1015
# CONFIG_SENSORS_EEPROM is not set
969
1016
# CONFIG_SENSORS_PCF8574 is not set
970
1017
# CONFIG_SENSORS_PCA9539 is not set
971
1018
# CONFIG_SENSORS_PCF8591 is not set
972
1019
# CONFIG_SENSORS_MAX6875 is not set
1020
+
# CONFIG_SENSORS_TSL2550 is not set
973
1021
# CONFIG_I2C_DEBUG_CORE is not set
974
1022
# CONFIG_I2C_DEBUG_ALGO is not set
975
1023
# CONFIG_I2C_DEBUG_BUS is not set
···
982
1026
#
983
1027
# CONFIG_SPI is not set
984
1028
# CONFIG_SPI_MASTER is not set
985
-
986
-
#
987
-
# Dallas's 1-wire bus
988
-
#
989
1029
# CONFIG_W1 is not set
1030
+
# CONFIG_POWER_SUPPLY is not set
990
1031
# CONFIG_HWMON is not set
991
1032
992
1033
#
···
1008
1055
#
1009
1056
# CONFIG_DISPLAY_SUPPORT is not set
1010
1057
# CONFIG_VGASTATE is not set
1058
+
CONFIG_VIDEO_OUTPUT_CONTROL=m
1011
1059
# CONFIG_FB is not set
1012
1060
# CONFIG_FB_IBM_GXT4500 is not set
1013
1061
···
1022
1068
# Sound
1023
1069
#
1024
1070
# CONFIG_SOUND is not set
1025
-
1026
-
#
1027
-
# HID Devices
1028
-
#
1071
+
CONFIG_HID_SUPPORT=y
1029
1072
CONFIG_HID=m
1030
1073
# CONFIG_HID_DEBUG is not set
1031
1074
···
1036
1085
#
1037
1086
# CONFIG_USB_KBD is not set
1038
1087
# CONFIG_USB_MOUSE is not set
1039
-
1040
-
#
1041
-
# USB support
1042
-
#
1088
+
CONFIG_USB_SUPPORT=y
1043
1089
CONFIG_USB_ARCH_HAS_HCD=y
1044
1090
CONFIG_USB_ARCH_HAS_OHCI=y
1045
1091
CONFIG_USB_ARCH_HAS_EHCI=y
···
1070
1122
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1071
1123
# CONFIG_USB_UHCI_HCD is not set
1072
1124
# CONFIG_USB_SL811_HCD is not set
1125
+
# CONFIG_USB_R8A66597_HCD is not set
1073
1126
1074
1127
#
1075
1128
# USB Device Class drivers
···
1148
1199
#
1149
1200
# CONFIG_USB_GADGET is not set
1150
1201
# CONFIG_MMC is not set
1151
-
1152
-
#
1153
-
# LED devices
1154
-
#
1155
1202
# CONFIG_NEW_LEDS is not set
1156
-
1157
-
#
1158
-
# LED drivers
1159
-
#
1160
-
1161
-
#
1162
-
# LED Triggers
1163
-
#
1164
-
1165
-
#
1166
-
# InfiniBand support
1167
-
#
1168
1203
CONFIG_INFINIBAND=m
1169
1204
CONFIG_INFINIBAND_USER_MAD=m
1170
1205
CONFIG_INFINIBAND_USER_ACCESS=m
···
1164
1231
CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
1165
1232
# CONFIG_INFINIBAND_SRP is not set
1166
1233
# CONFIG_INFINIBAND_ISER is not set
1234
+
CONFIG_EDAC=y
1167
1235
1168
1236
#
1169
-
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1237
+
# Reporting subsystems
1170
1238
#
1171
-
1172
-
#
1173
-
# Real Time Clock
1174
-
#
1239
+
# CONFIG_EDAC_DEBUG is not set
1240
+
CONFIG_EDAC_MM_EDAC=y
1175
1241
# CONFIG_RTC_CLASS is not set
1176
1242
1177
1243
#
···
1185
1253
#
1186
1254
# DMA Devices
1187
1255
#
1256
+
1257
+
#
1258
+
# Userspace I/O
1259
+
#
1260
+
CONFIG_UIO=m
1261
+
# CONFIG_UIO_CIF is not set
1188
1262
1189
1263
#
1190
1264
# File systems
···
1295
1357
# CONFIG_NCP_FS is not set
1296
1358
# CONFIG_CODA_FS is not set
1297
1359
# CONFIG_AFS_FS is not set
1298
-
# CONFIG_9P_FS is not set
1299
1360
1300
1361
#
1301
1362
# Partition Types
···
1376
1439
# CONFIG_CRC16 is not set
1377
1440
# CONFIG_CRC_ITU_T is not set
1378
1441
CONFIG_CRC32=y
1442
+
# CONFIG_CRC7 is not set
1379
1443
# CONFIG_LIBCRC32C is not set
1380
1444
CONFIG_ZLIB_INFLATE=m
1381
1445
CONFIG_ZLIB_DEFLATE=m
···
1409
1471
CONFIG_DEBUG_KERNEL=y
1410
1472
# CONFIG_DEBUG_SHIRQ is not set
1411
1473
# CONFIG_DETECT_SOFTLOCKUP is not set
1474
+
CONFIG_SCHED_DEBUG=y
1412
1475
# CONFIG_SCHEDSTATS is not set
1413
1476
# CONFIG_TIMER_STATS is not set
1414
-
# CONFIG_DEBUG_SLAB is not set
1477
+
# CONFIG_SLUB_DEBUG_ON is not set
1415
1478
# CONFIG_DEBUG_RT_MUTEXES is not set
1416
1479
# CONFIG_RT_MUTEX_TESTER is not set
1417
1480
# CONFIG_DEBUG_SPINLOCK is not set
···
1443
1504
#
1444
1505
# CONFIG_KEYS is not set
1445
1506
# CONFIG_SECURITY is not set
1446
-
1447
-
#
1448
-
# Cryptographic options
1449
-
#
1450
1507
CONFIG_CRYPTO=y
1451
1508
CONFIG_CRYPTO_ALGAPI=y
1452
1509
CONFIG_CRYPTO_BLKCIPHER=m
···
1481
1546
# CONFIG_CRYPTO_CRC32C is not set
1482
1547
# CONFIG_CRYPTO_CAMELLIA is not set
1483
1548
# CONFIG_CRYPTO_TEST is not set
1484
-
1485
-
#
1486
-
# Hardware crypto devices
1487
-
#
1549
+
CONFIG_CRYPTO_HW=y
+26
-6
arch/powerpc/mm/slb.c
+26
-6
arch/powerpc/mm/slb.c
···
74
74
get_slb_shadow()->save_area[entry].esid = 0;
75
75
}
76
76
77
+
static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags,
78
+
unsigned long entry)
79
+
{
80
+
/*
81
+
* Updating the shadow buffer before writing the SLB ensures
82
+
* we don't get a stale entry here if we get preempted by PHYP
83
+
* between these two statements.
84
+
*/
85
+
slb_shadow_update(ea, flags, entry);
86
+
87
+
asm volatile("slbmte %0,%1" :
88
+
: "r" (mk_vsid_data(ea, flags)),
89
+
"r" (mk_esid_data(ea, entry))
90
+
: "memory" );
91
+
}
92
+
77
93
void slb_flush_and_rebolt(void)
78
94
{
79
95
/* If you change this make sure you change SLB_NUM_BOLTED
···
242
226
vflags = SLB_VSID_KERNEL | vmalloc_llp;
243
227
244
228
/* Invalidate the entire SLB (even slot 0) & all the ERATS */
245
-
slb_shadow_update(PAGE_OFFSET, lflags, 0);
246
-
asm volatile("isync; slbia; sync; slbmte %0,%1; isync" ::
247
-
"r" (get_slb_shadow()->save_area[0].vsid),
248
-
"r" (get_slb_shadow()->save_area[0].esid) : "memory");
229
+
asm volatile("isync":::"memory");
230
+
asm volatile("slbmte %0,%0"::"r" (0) : "memory");
231
+
asm volatile("isync; slbia; isync":::"memory");
232
+
create_shadowed_slbe(PAGE_OFFSET, lflags, 0);
249
233
250
-
slb_shadow_update(VMALLOC_START, vflags, 1);
234
+
create_shadowed_slbe(VMALLOC_START, vflags, 1);
251
235
252
-
slb_flush_and_rebolt();
236
+
/* We don't bolt the stack for the time being - we're in boot,
237
+
* so the stack is in the bolted segment. By the time it goes
238
+
* elsewhere, we'll call _switch() which will bolt in the new
239
+
* one. */
240
+
asm volatile("isync":::"memory");
253
241
}
+6
-2
arch/powerpc/platforms/cell/cbe_regs.h
+6
-2
arch/powerpc/platforms/cell/cbe_regs.h
···
113
113
u64 checkstop_fir; /* 0x0c00 */
114
114
u64 recoverable_fir; /* 0x0c08 */
115
115
u64 spec_att_mchk_fir; /* 0x0c10 */
116
-
u64 fir_mode_reg; /* 0x0c18 */
116
+
u32 fir_mode_reg; /* 0x0c18 */
117
+
u8 pad_0x0c1c_0x0c20 [4]; /* 0x0c1c */
118
+
#define CBE_PMD_FIR_MODE_M8 0x00800
117
119
u64 fir_enable_mask; /* 0x0c20 */
118
120
119
-
u8 pad_0x0c28_0x1000 [0x1000 - 0x0c28]; /* 0x0c28 */
121
+
u8 pad_0x0c28_0x0ca8 [0x0ca8 - 0x0c28]; /* 0x0c28 */
122
+
u64 ras_esc_0; /* 0x0ca8 */
123
+
u8 pad_0x0cb0_0x1000 [0x1000 - 0x0cb0]; /* 0x0cb0 */
120
124
};
121
125
122
126
extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np);
+1
-5
arch/powerpc/platforms/cell/cbe_thermal.c
+1
-5
arch/powerpc/platforms/cell/cbe_thermal.c
···
88
88
/* returns the value for a given spu in a given register */
89
89
static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg)
90
90
{
91
-
const unsigned int *id;
92
91
union spe_reg value;
93
92
struct spu *spu;
94
93
95
-
/* getting the id from the reg attribute will not work on future device-tree layouts
96
-
* in future we should store the id to the spu struct and use it here */
97
94
spu = container_of(sysdev, struct spu, sysdev);
98
-
id = of_get_property(spu_devnode(spu), "reg", NULL);
99
95
value.val = in_be64(®->val);
100
96
101
-
return value.spe[*id];
97
+
return value.spe[spu->spe_id];
102
98
}
103
99
104
100
static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf)
+26
arch/powerpc/platforms/cell/pervasive.c
+26
arch/powerpc/platforms/cell/pervasive.c
···
38
38
#include "pervasive.h"
39
39
#include "cbe_regs.h"
40
40
41
+
static int sysreset_hack;
42
+
41
43
static void cbe_power_save(void)
42
44
{
43
45
unsigned long ctrl, thread_switch_control;
···
87
85
88
86
static int cbe_system_reset_exception(struct pt_regs *regs)
89
87
{
88
+
int cpu;
89
+
struct cbe_pmd_regs __iomem *pmd;
90
+
90
91
switch (regs->msr & SRR1_WAKEMASK) {
91
92
case SRR1_WAKEEE:
92
93
do_IRQ(regs);
···
98
93
timer_interrupt(regs);
99
94
break;
100
95
case SRR1_WAKEMT:
96
+
/*
97
+
* The BMC can inject user triggered system reset exceptions,
98
+
* but cannot set the system reset reason in srr1,
99
+
* so check an extra register here.
100
+
*/
101
+
if (sysreset_hack && (cpu = smp_processor_id()) == 0) {
102
+
pmd = cbe_get_cpu_pmd_regs(cpu);
103
+
if (in_be64(&pmd->ras_esc_0) & 0xffff) {
104
+
out_be64(&pmd->ras_esc_0, 0);
105
+
return 0;
106
+
}
107
+
}
101
108
break;
102
109
#ifdef CONFIG_CBE_RAS
103
110
case SRR1_WAKESYSERR:
···
130
113
void __init cbe_pervasive_init(void)
131
114
{
132
115
int cpu;
116
+
133
117
if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO))
134
118
return;
119
+
120
+
sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
135
121
136
122
for_each_possible_cpu(cpu) {
137
123
struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu);
···
144
124
/* Enable Pause(0) control bit */
145
125
out_be64(®s->pmcr, in_be64(®s->pmcr) |
146
126
CBE_PMD_PAUSE_ZERO_CONTROL);
127
+
128
+
/* Enable JTAG system-reset hack */
129
+
if (sysreset_hack)
130
+
out_be32(®s->fir_mode_reg,
131
+
in_be32(®s->fir_mode_reg) |
132
+
CBE_PMD_FIR_MODE_M8);
147
133
}
148
134
149
135
ppc_md.power_save = cbe_power_save;
+1
-1
arch/powerpc/platforms/cell/spu_manage.c
+1
-1
arch/powerpc/platforms/cell/spu_manage.c
+3
-3
arch/powerpc/platforms/pasemi/iommu.c
+3
-3
arch/powerpc/platforms/pasemi/iommu.c
···
93
93
94
94
pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr);
95
95
96
-
bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
96
+
bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
97
97
98
98
ip = ((u32 *)tbl->it_base) + index;
99
99
···
118
118
119
119
pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
120
120
121
-
bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
121
+
bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
122
122
123
123
ip = ((u32 *)tbl->it_base) + index;
124
124
···
137
137
iommu_table_iobmap.it_busno = 0;
138
138
iommu_table_iobmap.it_offset = 0;
139
139
/* it_size is in number of entries */
140
-
iommu_table_iobmap.it_size = 0x80000000 >> PAGE_SHIFT;
140
+
iommu_table_iobmap.it_size = 0x80000000 >> IOBMAP_PAGE_SHIFT;
141
141
142
142
/* Initialize the common IOMMU code */
143
143
iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;
+11
-35
arch/powerpc/sysdev/axonram.c
+11
-35
arch/powerpc/sysdev/axonram.c
···
59
59
struct axon_ram_bank {
60
60
struct of_device *device;
61
61
struct gendisk *disk;
62
-
unsigned int irq_correctable;
63
-
unsigned int irq_uncorrectable;
62
+
unsigned int irq_id;
64
63
unsigned long ph_addr;
65
64
unsigned long io_addr;
66
65
unsigned long size;
···
92
93
93
94
BUG_ON(!bank);
94
95
95
-
if (irq == bank->irq_correctable) {
96
-
dev_err(&device->dev, "Correctable memory error occured\n");
97
-
bank->ecc_counter++;
98
-
return IRQ_HANDLED;
99
-
} else if (irq == bank->irq_uncorrectable) {
100
-
dev_err(&device->dev, "Uncorrectable memory error occured\n");
101
-
panic("Critical ECC error on %s", device->node->full_name);
102
-
}
103
-
104
-
return IRQ_NONE;
96
+
dev_err(&device->dev, "Correctable memory error occured\n");
97
+
bank->ecc_counter++;
98
+
return IRQ_HANDLED;
105
99
}
106
100
107
101
/**
···
251
259
blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
252
260
add_disk(bank->disk);
253
261
254
-
bank->irq_correctable = irq_of_parse_and_map(device->node, 0);
255
-
bank->irq_uncorrectable = irq_of_parse_and_map(device->node, 1);
256
-
if ((bank->irq_correctable <= 0) || (bank->irq_uncorrectable <= 0)) {
262
+
bank->irq_id = irq_of_parse_and_map(device->node, 0);
263
+
if (bank->irq_id == NO_IRQ) {
257
264
dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
258
265
rc = -EFAULT;
259
266
goto failed;
260
267
}
261
268
262
-
rc = request_irq(bank->irq_correctable, axon_ram_irq_handler,
269
+
rc = request_irq(bank->irq_id, axon_ram_irq_handler,
263
270
AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
264
271
if (rc != 0) {
265
272
dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
266
-
bank->irq_correctable = bank->irq_uncorrectable = 0;
267
-
rc = -EFAULT;
268
-
goto failed;
269
-
}
270
-
271
-
rc = request_irq(bank->irq_uncorrectable, axon_ram_irq_handler,
272
-
AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
273
-
if (rc != 0) {
274
-
dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
275
-
bank->irq_uncorrectable = 0;
273
+
bank->irq_id = NO_IRQ;
276
274
rc = -EFAULT;
277
275
goto failed;
278
276
}
···
278
296
279
297
failed:
280
298
if (bank != NULL) {
281
-
if (bank->irq_uncorrectable > 0)
282
-
free_irq(bank->irq_uncorrectable, device);
283
-
if (bank->irq_correctable > 0)
284
-
free_irq(bank->irq_correctable, device);
299
+
if (bank->irq_id != NO_IRQ)
300
+
free_irq(bank->irq_id, device);
285
301
if (bank->disk != NULL) {
286
-
if (bank->disk->queue != NULL)
287
-
blk_cleanup_queue(bank->disk->queue);
288
302
if (bank->disk->major > 0)
289
303
unregister_blkdev(bank->disk->major,
290
304
bank->disk->disk_name);
···
307
329
BUG_ON(!bank || !bank->disk);
308
330
309
331
device_remove_file(&device->dev, &dev_attr_ecc);
310
-
free_irq(bank->irq_uncorrectable, device);
311
-
free_irq(bank->irq_correctable, device);
312
-
blk_cleanup_queue(bank->disk->queue);
332
+
free_irq(bank->irq_id, device);
313
333
unregister_blkdev(bank->disk->major, bank->disk->disk_name);
314
334
del_gendisk(bank->disk);
315
335
iounmap((void __iomem *) bank->io_addr);
+2
-2
drivers/macintosh/adb.c
+2
-2
drivers/macintosh/adb.c
···
89
89
static int autopoll_devs;
90
90
int __adb_probe_sync;
91
91
92
-
#ifdef CONFIG_PM
92
+
#ifdef CONFIG_PM_SLEEP
93
93
static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
94
94
static struct pmu_sleep_notifier adb_sleep_notifier = {
95
95
adb_notify_sleep,
···
313
313
printk(KERN_WARNING "Warning: no ADB interface detected\n");
314
314
adb_controller = NULL;
315
315
} else {
316
-
#ifdef CONFIG_PM
316
+
#ifdef CONFIG_PM_SLEEP
317
317
pmu_register_sleep_notifier(&adb_sleep_notifier);
318
318
#endif /* CONFIG_PM */
319
319
#ifdef CONFIG_PPC
+17
-17
drivers/macintosh/via-pmu.c
+17
-17
drivers/macintosh/via-pmu.c
···
152
152
static u8 pmu_intr_mask;
153
153
static int pmu_version;
154
154
static int drop_interrupts;
155
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
155
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
156
156
static int option_lid_wakeup = 1;
157
-
#endif /* CONFIG_PM && CONFIG_PPC32 */
158
-
#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
157
+
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
158
+
#if (defined(CONFIG_PM_SLEEP)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
159
159
static int sleep_in_progress;
160
160
#endif
161
161
static unsigned long async_req_locks;
···
875
875
{
876
876
char *p = page;
877
877
878
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
878
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
879
879
if (pmu_kind == PMU_KEYLARGO_BASED &&
880
880
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
881
881
p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
···
916
916
*(val++) = 0;
917
917
while(*val == ' ')
918
918
val++;
919
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
919
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
920
920
if (pmu_kind == PMU_KEYLARGO_BASED &&
921
921
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
922
922
if (!strcmp(label, "lid_wakeup"))
···
1738
1738
return via != 0;
1739
1739
}
1740
1740
1741
-
#ifdef CONFIG_PM
1741
+
#ifdef CONFIG_PM_SLEEP
1742
1742
1743
1743
static LIST_HEAD(sleep_notifiers);
1744
1744
···
1769
1769
return 0;
1770
1770
}
1771
1771
EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
1772
-
#endif /* CONFIG_PM */
1772
+
#endif /* CONFIG_PM_SLEEP */
1773
1773
1774
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
1774
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
1775
1775
1776
1776
/* Sleep is broadcast last-to-first */
1777
1777
static void broadcast_sleep(int when)
···
2390
2390
return 0;
2391
2391
}
2392
2392
2393
-
#endif /* CONFIG_PM && CONFIG_PPC32 */
2393
+
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2394
2394
2395
2395
/*
2396
2396
* Support for /dev/pmu device
···
2573
2573
int error = -EINVAL;
2574
2574
2575
2575
switch (cmd) {
2576
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
2576
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
2577
2577
case PMU_IOC_SLEEP:
2578
2578
if (!capable(CAP_SYS_ADMIN))
2579
2579
return -EACCES;
···
2601
2601
return put_user(0, argp);
2602
2602
else
2603
2603
return put_user(1, argp);
2604
-
#endif /* CONFIG_PM && CONFIG_PPC32 */
2604
+
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2605
2605
2606
2606
#ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
2607
2607
/* Compatibility ioctl's for backlight */
···
2757
2757
* to do suspend-to-disk.
2758
2758
*/
2759
2759
2760
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
2760
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
2761
2761
2762
2762
int pmu_sys_suspended;
2763
2763
···
2792
2792
return 0;
2793
2793
}
2794
2794
2795
-
#endif /* CONFIG_PM && CONFIG_PPC32 */
2795
+
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2796
2796
2797
2797
static struct sysdev_class pmu_sysclass = {
2798
2798
set_kset_name("pmu"),
···
2803
2803
};
2804
2804
2805
2805
static struct sysdev_driver driver_pmu = {
2806
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
2806
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
2807
2807
.suspend = &pmu_sys_suspend,
2808
2808
.resume = &pmu_sys_resume,
2809
-
#endif /* CONFIG_PM && CONFIG_PPC32 */
2809
+
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2810
2810
};
2811
2811
2812
2812
static int __init init_pmu_sysfs(void)
···
2841
2841
EXPORT_SYMBOL(pmu_suspend);
2842
2842
EXPORT_SYMBOL(pmu_resume);
2843
2843
EXPORT_SYMBOL(pmu_unlock);
2844
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
2844
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
2845
2845
EXPORT_SYMBOL(pmu_enable_irled);
2846
2846
EXPORT_SYMBOL(pmu_battery_count);
2847
2847
EXPORT_SYMBOL(pmu_batteries);
2848
2848
EXPORT_SYMBOL(pmu_power_flags);
2849
-
#endif /* CONFIG_PM && CONFIG_PPC32 */
2849
+
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2850
2850
+1
-1
include/linux/pmu.h
+1
-1
include/linux/pmu.h
···
226
226
extern void pmu_backlight_init(void);
227
227
228
228
/* some code needs to know if the PMU was suspended for hibernation */
229
-
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
229
+
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
230
230
extern int pmu_sys_suspended;
231
231
#else
232
232
/* if power management is not configured it can't be suspended */