Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: update defconfigs
[PATCH] powerpc: properly configure DDR/P5IOC children devs
[PATCH] powerpc: remove duplicate EXPORT_SYMBOLS
[PATCH] powerpc: RTC memory corruption
[PATCH] powerpc: enable NAP only on cpus who support it to avoid memory corruption
[PATCH] powerpc: Clarify wording for CRASH_DUMP Kconfig option
[PATCH] powerpc/64: enable CONFIG_BLK_DEV_SL82C105
[PATCH] powerpc: correct cacheflush loop in zImage
powerpc: Fix problem with time going backwards
powerpc: Disallow lparcfg being a module
+315
-181
+1
-1
arch/powerpc/Kconfig
+1
-1
arch/powerpc/Kconfig
···
580
580
strongly in flux, so no good recommendation can be made.
581
581
582
582
config CRASH_DUMP
583
-
bool "kernel crash dumps (EXPERIMENTAL)"
583
+
bool "Build a kdump crash kernel (EXPERIMENTAL)"
584
584
depends on PPC_MULTIPLATFORM && PPC64 && EXPERIMENTAL
585
585
help
586
586
Build a kernel suitable for use as a kdump capture kernel.
+3
-2
arch/powerpc/boot/crt0.S
+3
-2
arch/powerpc/boot/crt0.S
···
45
45
bdnz 2b
46
46
47
47
/* Do a cache flush for our text, in case OF didn't */
48
-
3: lis r9,_start@h
48
+
3: lis r9,_start@ha
49
+
addi r9,r9,_start@l
49
50
add r9,r0,r9
50
51
lis r8,_etext@ha
51
52
addi r8,r8,_etext@l
···
54
53
4: dcbf r0,r9
55
54
icbi r0,r9
56
55
addi r9,r9,0x20
57
-
cmplwi 0,r9,8
56
+
cmplw cr0,r9,r8
58
57
blt 4b
59
58
sync
60
59
isync
+66
-28
arch/powerpc/configs/cell_defconfig
+66
-28
arch/powerpc/configs/cell_defconfig
···
1
1
#
2
2
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.15-rc5
4
-
# Tue Dec 20 15:59:26 2005
3
+
# Linux kernel version: 2.6.16-rc6
4
+
# Wed Mar 15 16:19:48 2006
5
5
#
6
6
CONFIG_PPC64=y
7
7
CONFIG_64BIT=y
···
16
16
CONFIG_SYSVIPC_COMPAT=y
17
17
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
18
18
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
19
+
CONFIG_PPC_OF=y
20
+
CONFIG_PPC_UDBG_16550=y
21
+
# CONFIG_GENERIC_TBSYNC is not set
22
+
# CONFIG_DEFAULT_UIMAGE is not set
19
23
20
24
#
21
25
# Processor support
···
37
33
# Code maturity level options
38
34
#
39
35
CONFIG_EXPERIMENTAL=y
40
-
CONFIG_CLEAN_COMPILE=y
41
36
CONFIG_LOCK_KERNEL=y
42
37
CONFIG_INIT_ENV_ARG_LIMIT=32
43
38
···
51
48
# CONFIG_BSD_PROCESS_ACCT is not set
52
49
CONFIG_SYSCTL=y
53
50
# CONFIG_AUDIT is not set
54
-
CONFIG_HOTPLUG=y
55
-
CONFIG_KOBJECT_UEVENT=y
56
51
# CONFIG_IKCONFIG is not set
57
52
# CONFIG_CPUSETS is not set
58
53
CONFIG_INITRAMFS_SOURCE=""
···
59
58
CONFIG_KALLSYMS=y
60
59
# CONFIG_KALLSYMS_ALL is not set
61
60
# CONFIG_KALLSYMS_EXTRA_PASS is not set
61
+
CONFIG_HOTPLUG=y
62
62
CONFIG_PRINTK=y
63
63
CONFIG_BUG=y
64
+
CONFIG_ELF_CORE=y
64
65
CONFIG_BASE_FULL=y
65
66
CONFIG_FUTEX=y
66
67
CONFIG_EPOLL=y
···
71
68
CONFIG_CC_ALIGN_LABELS=0
72
69
CONFIG_CC_ALIGN_LOOPS=0
73
70
CONFIG_CC_ALIGN_JUMPS=0
71
+
CONFIG_SLAB=y
74
72
# CONFIG_TINY_SHMEM is not set
75
73
CONFIG_BASE_SMALL=0
74
+
# CONFIG_SLOB is not set
76
75
77
76
#
78
77
# Loadable module support
···
116
111
# CONFIG_PPC_PMAC is not set
117
112
# CONFIG_PPC_MAPLE is not set
118
113
CONFIG_PPC_CELL=y
119
-
CONFIG_PPC_OF=y
120
114
# CONFIG_U3_DART is not set
121
115
CONFIG_PPC_RTAS=y
122
116
# CONFIG_RTAS_ERROR_LOGGING is not set
···
124
120
CONFIG_MMIO_NVRAM=y
125
121
CONFIG_CELL_IIC=y
126
122
# CONFIG_PPC_MPC106 is not set
127
-
# CONFIG_GENERIC_TBSYNC is not set
128
123
# CONFIG_CPU_FREQ is not set
129
124
# CONFIG_WANT_EARLY_SERIAL is not set
125
+
126
+
#
127
+
# Cell Broadband Engine options
128
+
#
129
+
CONFIG_SPU_FS=y
130
130
131
131
#
132
132
# Kernel options
···
148
140
CONFIG_FORCE_MAX_ZONEORDER=13
149
141
# CONFIG_IOMMU_VMERGE is not set
150
142
CONFIG_KEXEC=y
143
+
# CONFIG_CRASH_DUMP is not set
151
144
CONFIG_IRQ_ALL_CPUS=y
152
145
# CONFIG_NUMA is not set
153
146
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
···
200
191
#
201
192
# Networking options
202
193
#
194
+
# CONFIG_NETDEBUG is not set
203
195
CONFIG_PACKET=y
204
196
# CONFIG_PACKET_MMAP is not set
205
197
CONFIG_UNIX=y
···
244
234
# Core Netfilter Configuration
245
235
#
246
236
# CONFIG_NETFILTER_NETLINK is not set
237
+
CONFIG_NETFILTER_XTABLES=m
238
+
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
239
+
CONFIG_NETFILTER_XT_TARGET_MARK=m
240
+
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
241
+
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
242
+
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
243
+
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
244
+
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
245
+
CONFIG_NETFILTER_XT_MATCH_HELPER=m
246
+
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
247
+
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
248
+
CONFIG_NETFILTER_XT_MATCH_MAC=m
249
+
CONFIG_NETFILTER_XT_MATCH_MARK=m
250
+
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
251
+
CONFIG_NETFILTER_XT_MATCH_REALM=m
252
+
CONFIG_NETFILTER_XT_MATCH_SCTP=m
253
+
CONFIG_NETFILTER_XT_MATCH_STATE=m
254
+
CONFIG_NETFILTER_XT_MATCH_STRING=m
255
+
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
247
256
248
257
#
249
258
# IP: Netfilter Configuration
···
280
251
# CONFIG_IP_NF_PPTP is not set
281
252
CONFIG_IP_NF_QUEUE=m
282
253
CONFIG_IP_NF_IPTABLES=m
283
-
CONFIG_IP_NF_MATCH_LIMIT=m
284
254
CONFIG_IP_NF_MATCH_IPRANGE=m
285
-
CONFIG_IP_NF_MATCH_MAC=m
286
-
CONFIG_IP_NF_MATCH_PKTTYPE=m
287
-
CONFIG_IP_NF_MATCH_MARK=m
288
255
CONFIG_IP_NF_MATCH_MULTIPORT=m
289
256
CONFIG_IP_NF_MATCH_TOS=m
290
257
CONFIG_IP_NF_MATCH_RECENT=m
291
258
CONFIG_IP_NF_MATCH_ECN=m
292
259
CONFIG_IP_NF_MATCH_DSCP=m
293
260
CONFIG_IP_NF_MATCH_AH_ESP=m
294
-
CONFIG_IP_NF_MATCH_LENGTH=m
295
261
CONFIG_IP_NF_MATCH_TTL=m
296
-
CONFIG_IP_NF_MATCH_TCPMSS=m
297
-
CONFIG_IP_NF_MATCH_HELPER=m
298
-
CONFIG_IP_NF_MATCH_STATE=m
299
-
CONFIG_IP_NF_MATCH_CONNTRACK=m
300
262
CONFIG_IP_NF_MATCH_OWNER=m
301
263
CONFIG_IP_NF_MATCH_ADDRTYPE=m
302
-
CONFIG_IP_NF_MATCH_REALM=m
303
-
CONFIG_IP_NF_MATCH_SCTP=m
304
-
# CONFIG_IP_NF_MATCH_DCCP is not set
305
-
CONFIG_IP_NF_MATCH_COMMENT=m
306
264
CONFIG_IP_NF_MATCH_HASHLIMIT=m
307
-
CONFIG_IP_NF_MATCH_STRING=m
265
+
CONFIG_IP_NF_MATCH_POLICY=m
308
266
CONFIG_IP_NF_FILTER=m
309
267
CONFIG_IP_NF_TARGET_REJECT=m
310
268
CONFIG_IP_NF_TARGET_LOG=m
311
269
CONFIG_IP_NF_TARGET_ULOG=m
312
270
CONFIG_IP_NF_TARGET_TCPMSS=m
313
-
CONFIG_IP_NF_TARGET_NFQUEUE=m
314
271
CONFIG_IP_NF_NAT=m
315
272
CONFIG_IP_NF_NAT_NEEDED=y
316
273
CONFIG_IP_NF_TARGET_MASQUERADE=m
···
312
297
CONFIG_IP_NF_TARGET_TOS=m
313
298
CONFIG_IP_NF_TARGET_ECN=m
314
299
CONFIG_IP_NF_TARGET_DSCP=m
315
-
CONFIG_IP_NF_TARGET_MARK=m
316
-
CONFIG_IP_NF_TARGET_CLASSIFY=m
317
300
CONFIG_IP_NF_TARGET_TTL=m
318
301
CONFIG_IP_NF_RAW=m
319
-
CONFIG_IP_NF_TARGET_NOTRACK=m
320
302
CONFIG_IP_NF_ARPTABLES=m
321
303
CONFIG_IP_NF_ARPFILTER=m
322
304
CONFIG_IP_NF_ARP_MANGLE=m
···
323
311
#
324
312
# CONFIG_IP6_NF_QUEUE is not set
325
313
# CONFIG_IP6_NF_IPTABLES is not set
326
-
# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
327
314
328
315
#
329
316
# DCCP Configuration (EXPERIMENTAL)
···
333
322
# SCTP Configuration (EXPERIMENTAL)
334
323
#
335
324
# CONFIG_IP_SCTP is not set
325
+
326
+
#
327
+
# TIPC Configuration (EXPERIMENTAL)
328
+
#
329
+
# CONFIG_TIPC is not set
336
330
# CONFIG_ATM is not set
337
331
# CONFIG_BRIDGE is not set
338
332
# CONFIG_VLAN_8021Q is not set
···
556
540
# CONFIG_R8169 is not set
557
541
# CONFIG_SIS190 is not set
558
542
CONFIG_SKGE=m
543
+
# CONFIG_SKY2 is not set
559
544
# CONFIG_SK98LIN is not set
560
545
# CONFIG_TIGON3 is not set
561
546
# CONFIG_BNX2 is not set
547
+
CONFIG_SPIDER_NET=y
562
548
# CONFIG_MV643XX_ETH is not set
563
549
564
550
#
···
646
628
CONFIG_VT_CONSOLE=y
647
629
CONFIG_HW_CONSOLE=y
648
630
CONFIG_SERIAL_NONSTANDARD=y
631
+
# CONFIG_COMPUTONE is not set
649
632
# CONFIG_ROCKETPORT is not set
650
633
# CONFIG_CYCLADES is not set
651
634
# CONFIG_DIGIEPCA is not set
635
+
# CONFIG_MOXA_INTELLIO is not set
652
636
# CONFIG_MOXA_SMARTIO is not set
653
637
# CONFIG_ISI is not set
654
638
# CONFIG_SYNCLINK is not set
655
639
# CONFIG_SYNCLINKMP is not set
640
+
# CONFIG_SYNCLINK_GT is not set
656
641
# CONFIG_N_HDLC is not set
657
642
# CONFIG_SPECIALIX is not set
658
643
# CONFIG_SX is not set
···
667
646
CONFIG_SERIAL_8250=y
668
647
CONFIG_SERIAL_8250_CONSOLE=y
669
648
CONFIG_SERIAL_8250_NR_UARTS=4
649
+
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
670
650
# CONFIG_SERIAL_8250_EXTENDED is not set
671
651
672
652
#
···
778
756
# CONFIG_I2C_DEBUG_CHIP is not set
779
757
780
758
#
759
+
# SPI support
760
+
#
761
+
# CONFIG_SPI is not set
762
+
# CONFIG_SPI_MASTER is not set
763
+
764
+
#
781
765
# Dallas's 1-wire bus
782
766
#
783
767
# CONFIG_W1 is not set
···
855
827
# CONFIG_INFINIBAND is not set
856
828
857
829
#
858
-
# SN Devices
830
+
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
859
831
#
860
832
861
833
#
···
875
847
# CONFIG_JFS_FS is not set
876
848
CONFIG_FS_POSIX_ACL=y
877
849
# CONFIG_XFS_FS is not set
850
+
# CONFIG_OCFS2_FS is not set
878
851
# CONFIG_MINIX_FS is not set
879
852
# CONFIG_ROMFS_FS is not set
880
853
CONFIG_INOTIFY=y
···
915
886
CONFIG_HUGETLB_PAGE=y
916
887
CONFIG_RAMFS=y
917
888
# CONFIG_RELAYFS_FS is not set
889
+
# CONFIG_CONFIGFS_FS is not set
918
890
919
891
#
920
892
# Miscellaneous filesystems
···
981
951
# CONFIG_SGI_PARTITION is not set
982
952
# CONFIG_ULTRIX_PARTITION is not set
983
953
# CONFIG_SUN_PARTITION is not set
954
+
# CONFIG_KARMA_PARTITION is not set
984
955
CONFIG_EFI_PARTITION=y
985
956
986
957
#
···
1052
1021
# Kernel hacking
1053
1022
#
1054
1023
# CONFIG_PRINTK_TIME is not set
1055
-
CONFIG_DEBUG_KERNEL=y
1056
1024
CONFIG_MAGIC_SYSRQ=y
1025
+
CONFIG_DEBUG_KERNEL=y
1057
1026
CONFIG_LOG_BUF_SHIFT=15
1058
1027
CONFIG_DETECT_SOFTLOCKUP=y
1059
1028
# CONFIG_SCHEDSTATS is not set
1060
1029
# CONFIG_DEBUG_SLAB is not set
1030
+
# CONFIG_DEBUG_MUTEXES is not set
1061
1031
# CONFIG_DEBUG_SPINLOCK is not set
1062
1032
CONFIG_DEBUG_SPINLOCK_SLEEP=y
1063
1033
# CONFIG_DEBUG_KOBJECT is not set
1064
1034
# CONFIG_DEBUG_INFO is not set
1065
1035
CONFIG_DEBUG_FS=y
1066
1036
# CONFIG_DEBUG_VM is not set
1037
+
# CONFIG_FORCED_INLINING is not set
1067
1038
# CONFIG_RCU_TORTURE_TEST is not set
1068
1039
# CONFIG_DEBUG_STACKOVERFLOW is not set
1069
1040
# CONFIG_DEBUG_STACK_USAGE is not set
···
1073
1040
# CONFIG_XMON is not set
1074
1041
CONFIG_IRQSTACKS=y
1075
1042
# CONFIG_BOOTX_TEXT is not set
1043
+
# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
1044
+
# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1045
+
# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
1046
+
# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1047
+
# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1076
1048
1077
1049
#
1078
1050
# Security options
+58
-38
arch/powerpc/configs/iseries_defconfig
+58
-38
arch/powerpc/configs/iseries_defconfig
···
1
1
#
2
2
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.15-rc5
4
-
# Tue Dec 20 15:59:32 2005
3
+
# Linux kernel version: 2.6.16-rc6
4
+
# Wed Mar 15 16:19:52 2006
5
5
#
6
6
CONFIG_PPC64=y
7
7
CONFIG_64BIT=y
···
16
16
CONFIG_SYSVIPC_COMPAT=y
17
17
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
18
18
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
19
+
CONFIG_PPC_OF=y
20
+
# CONFIG_PPC_UDBG_16550 is not set
21
+
# CONFIG_GENERIC_TBSYNC is not set
22
+
# CONFIG_DEFAULT_UIMAGE is not set
19
23
20
24
#
21
25
# Processor support
···
37
33
# Code maturity level options
38
34
#
39
35
CONFIG_EXPERIMENTAL=y
40
-
CONFIG_CLEAN_COMPILE=y
41
36
CONFIG_LOCK_KERNEL=y
42
37
CONFIG_INIT_ENV_ARG_LIMIT=32
43
38
···
52
49
CONFIG_SYSCTL=y
53
50
CONFIG_AUDIT=y
54
51
CONFIG_AUDITSYSCALL=y
55
-
CONFIG_HOTPLUG=y
56
-
CONFIG_KOBJECT_UEVENT=y
57
52
CONFIG_IKCONFIG=y
58
53
CONFIG_IKCONFIG_PROC=y
59
54
# CONFIG_CPUSETS is not set
···
61
60
CONFIG_KALLSYMS=y
62
61
# CONFIG_KALLSYMS_ALL is not set
63
62
# CONFIG_KALLSYMS_EXTRA_PASS is not set
63
+
CONFIG_HOTPLUG=y
64
64
CONFIG_PRINTK=y
65
65
CONFIG_BUG=y
66
+
CONFIG_ELF_CORE=y
66
67
CONFIG_BASE_FULL=y
67
68
CONFIG_FUTEX=y
68
69
CONFIG_EPOLL=y
···
73
70
CONFIG_CC_ALIGN_LABELS=0
74
71
CONFIG_CC_ALIGN_LOOPS=0
75
72
CONFIG_CC_ALIGN_JUMPS=0
73
+
CONFIG_SLAB=y
76
74
# CONFIG_TINY_SHMEM is not set
77
75
CONFIG_BASE_SMALL=0
76
+
# CONFIG_SLOB is not set
78
77
79
78
#
80
79
# Loadable module support
···
118
113
# CONFIG_MMIO_NVRAM is not set
119
114
CONFIG_IBMVIO=y
120
115
# CONFIG_PPC_MPC106 is not set
121
-
# CONFIG_GENERIC_TBSYNC is not set
122
116
# CONFIG_CPU_FREQ is not set
123
117
# CONFIG_WANT_EARLY_SERIAL is not set
124
118
···
187
183
#
188
184
# Networking options
189
185
#
186
+
# CONFIG_NETDEBUG is not set
190
187
CONFIG_PACKET=y
191
188
# CONFIG_PACKET_MMAP is not set
192
189
CONFIG_UNIX=y
···
225
220
# Core Netfilter Configuration
226
221
#
227
222
# CONFIG_NETFILTER_NETLINK is not set
223
+
CONFIG_NETFILTER_XTABLES=m
224
+
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
225
+
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
226
+
CONFIG_NETFILTER_XT_TARGET_MARK=m
227
+
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
228
+
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
229
+
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
230
+
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
231
+
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
232
+
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
233
+
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
234
+
CONFIG_NETFILTER_XT_MATCH_HELPER=m
235
+
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
236
+
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
237
+
CONFIG_NETFILTER_XT_MATCH_MAC=m
238
+
CONFIG_NETFILTER_XT_MATCH_MARK=m
239
+
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
240
+
CONFIG_NETFILTER_XT_MATCH_REALM=m
241
+
CONFIG_NETFILTER_XT_MATCH_SCTP=m
242
+
CONFIG_NETFILTER_XT_MATCH_STATE=m
243
+
CONFIG_NETFILTER_XT_MATCH_STRING=m
244
+
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
228
245
229
246
#
230
247
# IP: Netfilter Configuration
···
264
237
# CONFIG_IP_NF_PPTP is not set
265
238
CONFIG_IP_NF_QUEUE=m
266
239
CONFIG_IP_NF_IPTABLES=m
267
-
CONFIG_IP_NF_MATCH_LIMIT=m
268
240
CONFIG_IP_NF_MATCH_IPRANGE=m
269
-
CONFIG_IP_NF_MATCH_MAC=m
270
-
CONFIG_IP_NF_MATCH_PKTTYPE=m
271
-
CONFIG_IP_NF_MATCH_MARK=m
272
241
CONFIG_IP_NF_MATCH_MULTIPORT=m
273
242
CONFIG_IP_NF_MATCH_TOS=m
274
243
CONFIG_IP_NF_MATCH_RECENT=m
275
244
CONFIG_IP_NF_MATCH_ECN=m
276
245
CONFIG_IP_NF_MATCH_DSCP=m
277
246
CONFIG_IP_NF_MATCH_AH_ESP=m
278
-
CONFIG_IP_NF_MATCH_LENGTH=m
279
247
CONFIG_IP_NF_MATCH_TTL=m
280
-
CONFIG_IP_NF_MATCH_TCPMSS=m
281
-
CONFIG_IP_NF_MATCH_HELPER=m
282
-
CONFIG_IP_NF_MATCH_STATE=m
283
-
CONFIG_IP_NF_MATCH_CONNTRACK=m
284
248
CONFIG_IP_NF_MATCH_OWNER=m
285
249
CONFIG_IP_NF_MATCH_ADDRTYPE=m
286
-
CONFIG_IP_NF_MATCH_REALM=m
287
-
CONFIG_IP_NF_MATCH_SCTP=m
288
-
# CONFIG_IP_NF_MATCH_DCCP is not set
289
-
CONFIG_IP_NF_MATCH_COMMENT=m
290
-
CONFIG_IP_NF_MATCH_CONNMARK=m
291
-
CONFIG_IP_NF_MATCH_CONNBYTES=m
292
250
CONFIG_IP_NF_MATCH_HASHLIMIT=m
293
-
CONFIG_IP_NF_MATCH_STRING=m
251
+
CONFIG_IP_NF_MATCH_POLICY=m
294
252
CONFIG_IP_NF_FILTER=m
295
253
CONFIG_IP_NF_TARGET_REJECT=m
296
254
CONFIG_IP_NF_TARGET_LOG=m
297
255
CONFIG_IP_NF_TARGET_ULOG=m
298
256
CONFIG_IP_NF_TARGET_TCPMSS=m
299
-
CONFIG_IP_NF_TARGET_NFQUEUE=m
300
257
CONFIG_IP_NF_NAT=m
301
258
CONFIG_IP_NF_NAT_NEEDED=y
302
259
CONFIG_IP_NF_TARGET_MASQUERADE=m
···
296
285
CONFIG_IP_NF_TARGET_TOS=m
297
286
CONFIG_IP_NF_TARGET_ECN=m
298
287
CONFIG_IP_NF_TARGET_DSCP=m
299
-
CONFIG_IP_NF_TARGET_MARK=m
300
-
CONFIG_IP_NF_TARGET_CLASSIFY=m
301
288
CONFIG_IP_NF_TARGET_TTL=m
302
-
CONFIG_IP_NF_TARGET_CONNMARK=m
303
289
CONFIG_IP_NF_TARGET_CLUSTERIP=m
304
290
CONFIG_IP_NF_RAW=m
305
-
CONFIG_IP_NF_TARGET_NOTRACK=m
306
291
CONFIG_IP_NF_ARPTABLES=m
307
292
CONFIG_IP_NF_ARPFILTER=m
308
293
CONFIG_IP_NF_ARP_MANGLE=m
···
312
305
# SCTP Configuration (EXPERIMENTAL)
313
306
#
314
307
# CONFIG_IP_SCTP is not set
308
+
309
+
#
310
+
# TIPC Configuration (EXPERIMENTAL)
311
+
#
312
+
# CONFIG_TIPC is not set
315
313
# CONFIG_ATM is not set
316
314
# CONFIG_BRIDGE is not set
317
315
# CONFIG_VLAN_8021Q is not set
···
463
451
# CONFIG_SCSI_IPR is not set
464
452
# CONFIG_SCSI_QLOGIC_FC is not set
465
453
# CONFIG_SCSI_QLOGIC_1280 is not set
466
-
CONFIG_SCSI_QLA2XXX=y
467
-
# CONFIG_SCSI_QLA21XX is not set
468
-
# CONFIG_SCSI_QLA22XX is not set
469
-
# CONFIG_SCSI_QLA2300 is not set
470
-
# CONFIG_SCSI_QLA2322 is not set
471
-
# CONFIG_SCSI_QLA6312 is not set
472
-
# CONFIG_SCSI_QLA24XX is not set
454
+
# CONFIG_SCSI_QLA_FC is not set
473
455
# CONFIG_SCSI_LPFC is not set
474
456
# CONFIG_SCSI_DC395x is not set
475
457
# CONFIG_SCSI_DC390T is not set
···
580
574
# CONFIG_R8169 is not set
581
575
# CONFIG_SIS190 is not set
582
576
# CONFIG_SKGE is not set
577
+
# CONFIG_SKY2 is not set
583
578
# CONFIG_SK98LIN is not set
584
579
# CONFIG_VIA_VELOCITY is not set
585
580
# CONFIG_TIGON3 is not set
···
730
723
# CONFIG_I2C is not set
731
724
732
725
#
726
+
# SPI support
727
+
#
728
+
# CONFIG_SPI is not set
729
+
# CONFIG_SPI_MASTER is not set
730
+
731
+
#
733
732
# Dallas's 1-wire bus
734
733
#
735
734
# CONFIG_W1 is not set
···
801
788
# CONFIG_INFINIBAND is not set
802
789
803
790
#
804
-
# SN Devices
791
+
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
805
792
#
806
793
807
794
#
···
838
825
CONFIG_XFS_SECURITY=y
839
826
CONFIG_XFS_POSIX_ACL=y
840
827
# CONFIG_XFS_RT is not set
828
+
# CONFIG_OCFS2_FS is not set
841
829
# CONFIG_MINIX_FS is not set
842
830
# CONFIG_ROMFS_FS is not set
843
831
CONFIG_INOTIFY=y
···
879
865
# CONFIG_HUGETLB_PAGE is not set
880
866
CONFIG_RAMFS=y
881
867
# CONFIG_RELAYFS_FS is not set
868
+
# CONFIG_CONFIGFS_FS is not set
882
869
883
870
#
884
871
# Miscellaneous filesystems
···
1008
993
#
1009
994
# Instrumentation Support
1010
995
#
1011
-
CONFIG_PROFILING=y
1012
-
CONFIG_OPROFILE=y
1013
996
# CONFIG_KPROBES is not set
1014
997
1015
998
#
1016
999
# Kernel hacking
1017
1000
#
1018
1001
# CONFIG_PRINTK_TIME is not set
1019
-
CONFIG_DEBUG_KERNEL=y
1020
1002
CONFIG_MAGIC_SYSRQ=y
1003
+
CONFIG_DEBUG_KERNEL=y
1021
1004
CONFIG_LOG_BUF_SHIFT=17
1022
1005
CONFIG_DETECT_SOFTLOCKUP=y
1023
1006
# CONFIG_SCHEDSTATS is not set
1024
1007
# CONFIG_DEBUG_SLAB is not set
1008
+
# CONFIG_DEBUG_MUTEXES is not set
1025
1009
# CONFIG_DEBUG_SPINLOCK is not set
1026
1010
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1027
1011
# CONFIG_DEBUG_KOBJECT is not set
1028
1012
# CONFIG_DEBUG_INFO is not set
1029
1013
CONFIG_DEBUG_FS=y
1030
1014
# CONFIG_DEBUG_VM is not set
1015
+
# CONFIG_FORCED_INLINING is not set
1031
1016
# CONFIG_RCU_TORTURE_TEST is not set
1032
1017
CONFIG_DEBUG_STACKOVERFLOW=y
1033
1018
CONFIG_DEBUG_STACK_USAGE=y
1034
1019
# CONFIG_DEBUGGER is not set
1035
1020
CONFIG_IRQSTACKS=y
1021
+
# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
1022
+
# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1023
+
# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
1024
+
# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1025
+
# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1036
1026
1037
1027
#
1038
1028
# Security options
+41
-9
arch/powerpc/configs/maple_defconfig
+41
-9
arch/powerpc/configs/maple_defconfig
···
1
1
#
2
2
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.15-rc5
4
-
# Tue Dec 20 15:59:36 2005
3
+
# Linux kernel version: 2.6.16-rc6
4
+
# Wed Mar 15 16:19:54 2006
5
5
#
6
6
CONFIG_PPC64=y
7
7
CONFIG_64BIT=y
···
16
16
CONFIG_SYSVIPC_COMPAT=y
17
17
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
18
18
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
19
+
CONFIG_PPC_OF=y
20
+
CONFIG_PPC_UDBG_16550=y
21
+
CONFIG_GENERIC_TBSYNC=y
22
+
# CONFIG_DEFAULT_UIMAGE is not set
19
23
20
24
#
21
25
# Processor support
···
36
32
# Code maturity level options
37
33
#
38
34
CONFIG_EXPERIMENTAL=y
39
-
CONFIG_CLEAN_COMPILE=y
40
35
CONFIG_LOCK_KERNEL=y
41
36
CONFIG_INIT_ENV_ARG_LIMIT=32
42
37
···
50
47
# CONFIG_BSD_PROCESS_ACCT is not set
51
48
CONFIG_SYSCTL=y
52
49
# CONFIG_AUDIT is not set
53
-
# CONFIG_HOTPLUG is not set
54
-
CONFIG_KOBJECT_UEVENT=y
55
50
CONFIG_IKCONFIG=y
56
51
CONFIG_IKCONFIG_PROC=y
57
52
# CONFIG_CPUSETS is not set
···
59
58
CONFIG_KALLSYMS=y
60
59
CONFIG_KALLSYMS_ALL=y
61
60
# CONFIG_KALLSYMS_EXTRA_PASS is not set
61
+
CONFIG_HOTPLUG=y
62
62
CONFIG_PRINTK=y
63
63
CONFIG_BUG=y
64
+
CONFIG_ELF_CORE=y
64
65
CONFIG_BASE_FULL=y
65
66
CONFIG_FUTEX=y
66
67
CONFIG_EPOLL=y
···
71
68
CONFIG_CC_ALIGN_LABELS=0
72
69
CONFIG_CC_ALIGN_LOOPS=0
73
70
CONFIG_CC_ALIGN_JUMPS=0
71
+
CONFIG_SLAB=y
74
72
# CONFIG_TINY_SHMEM is not set
75
73
CONFIG_BASE_SMALL=0
74
+
# CONFIG_SLOB is not set
76
75
77
76
#
78
77
# Loadable module support
···
116
111
# CONFIG_PPC_PMAC is not set
117
112
CONFIG_PPC_MAPLE=y
118
113
# CONFIG_PPC_CELL is not set
119
-
CONFIG_PPC_OF=y
120
114
CONFIG_U3_DART=y
121
115
CONFIG_MPIC=y
122
116
# CONFIG_PPC_RTAS is not set
123
117
# CONFIG_MMIO_NVRAM is not set
124
118
CONFIG_MPIC_BROKEN_U3=y
125
119
# CONFIG_PPC_MPC106 is not set
126
-
CONFIG_GENERIC_TBSYNC=y
127
120
# CONFIG_CPU_FREQ is not set
128
121
# CONFIG_WANT_EARLY_SERIAL is not set
129
122
···
141
138
CONFIG_FORCE_MAX_ZONEORDER=13
142
139
CONFIG_IOMMU_VMERGE=y
143
140
CONFIG_KEXEC=y
141
+
# CONFIG_CRASH_DUMP is not set
144
142
CONFIG_IRQ_ALL_CPUS=y
145
143
# CONFIG_NUMA is not set
146
144
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
···
193
189
#
194
190
# Networking options
195
191
#
192
+
# CONFIG_NETDEBUG is not set
196
193
CONFIG_PACKET=y
197
194
CONFIG_PACKET_MMAP=y
198
195
CONFIG_UNIX=y
···
231
226
# SCTP Configuration (EXPERIMENTAL)
232
227
#
233
228
# CONFIG_IP_SCTP is not set
229
+
230
+
#
231
+
# TIPC Configuration (EXPERIMENTAL)
232
+
#
233
+
# CONFIG_TIPC is not set
234
234
# CONFIG_ATM is not set
235
235
# CONFIG_BRIDGE is not set
236
236
# CONFIG_VLAN_8021Q is not set
···
471
461
# CONFIG_R8169 is not set
472
462
# CONFIG_SIS190 is not set
473
463
# CONFIG_SKGE is not set
464
+
# CONFIG_SKY2 is not set
474
465
# CONFIG_SK98LIN is not set
475
466
# CONFIG_VIA_VELOCITY is not set
476
467
# CONFIG_TIGON3 is not set
···
564
553
CONFIG_SERIAL_8250=y
565
554
CONFIG_SERIAL_8250_CONSOLE=y
566
555
CONFIG_SERIAL_8250_NR_UARTS=4
556
+
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
567
557
# CONFIG_SERIAL_8250_EXTENDED is not set
568
558
569
559
#
···
663
651
# CONFIG_I2C_DEBUG_CHIP is not set
664
652
665
653
#
654
+
# SPI support
655
+
#
656
+
# CONFIG_SPI is not set
657
+
# CONFIG_SPI_MASTER is not set
658
+
659
+
#
666
660
# Dallas's 1-wire bus
667
661
#
668
662
# CONFIG_W1 is not set
···
756
738
# may also be needed; see USB_STORAGE Help for more information
757
739
#
758
740
# CONFIG_USB_STORAGE is not set
741
+
# CONFIG_USB_LIBUSUAL is not set
759
742
760
743
#
761
744
# USB Input Devices
762
745
#
763
746
CONFIG_USB_HID=y
764
747
CONFIG_USB_HIDINPUT=y
748
+
# CONFIG_USB_HIDINPUT_POWERBOOK is not set
765
749
# CONFIG_HID_FF is not set
766
750
# CONFIG_USB_HIDDEV is not set
767
751
# CONFIG_USB_AIPTEK is not set
···
777
757
# CONFIG_USB_YEALINK is not set
778
758
# CONFIG_USB_XPAD is not set
779
759
# CONFIG_USB_ATI_REMOTE is not set
760
+
# CONFIG_USB_ATI_REMOTE2 is not set
780
761
# CONFIG_USB_KEYSPAN_REMOTE is not set
781
762
# CONFIG_USB_APPLETOUCH is not set
782
763
···
818
797
# CONFIG_USB_SERIAL_AIRPRIME is not set
819
798
# CONFIG_USB_SERIAL_ANYDATA is not set
820
799
# CONFIG_USB_SERIAL_BELKIN is not set
800
+
# CONFIG_USB_SERIAL_WHITEHEAT is not set
821
801
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
822
802
# CONFIG_USB_SERIAL_CP2101 is not set
823
803
CONFIG_USB_SERIAL_CYPRESS_M8=m
···
895
873
# CONFIG_INFINIBAND is not set
896
874
897
875
#
898
-
# SN Devices
876
+
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
899
877
#
900
878
901
879
#
···
913
891
# CONFIG_JFS_FS is not set
914
892
CONFIG_FS_POSIX_ACL=y
915
893
# CONFIG_XFS_FS is not set
894
+
# CONFIG_OCFS2_FS is not set
916
895
# CONFIG_MINIX_FS is not set
917
896
# CONFIG_ROMFS_FS is not set
918
897
CONFIG_INOTIFY=y
···
950
927
CONFIG_HUGETLB_PAGE=y
951
928
CONFIG_RAMFS=y
952
929
# CONFIG_RELAYFS_FS is not set
930
+
# CONFIG_CONFIGFS_FS is not set
953
931
954
932
#
955
933
# Miscellaneous filesystems
···
1012
988
# CONFIG_SGI_PARTITION is not set
1013
989
# CONFIG_ULTRIX_PARTITION is not set
1014
990
# CONFIG_SUN_PARTITION is not set
991
+
# CONFIG_KARMA_PARTITION is not set
1015
992
# CONFIG_EFI_PARTITION is not set
1016
993
1017
994
#
···
1078
1053
# Kernel hacking
1079
1054
#
1080
1055
# CONFIG_PRINTK_TIME is not set
1081
-
CONFIG_DEBUG_KERNEL=y
1082
1056
CONFIG_MAGIC_SYSRQ=y
1057
+
CONFIG_DEBUG_KERNEL=y
1083
1058
CONFIG_LOG_BUF_SHIFT=17
1084
1059
CONFIG_DETECT_SOFTLOCKUP=y
1085
1060
# CONFIG_SCHEDSTATS is not set
1086
1061
CONFIG_DEBUG_SLAB=y
1062
+
# CONFIG_DEBUG_MUTEXES is not set
1087
1063
# CONFIG_DEBUG_SPINLOCK is not set
1088
1064
CONFIG_DEBUG_SPINLOCK_SLEEP=y
1089
1065
# CONFIG_DEBUG_KOBJECT is not set
1090
1066
# CONFIG_DEBUG_INFO is not set
1091
1067
CONFIG_DEBUG_FS=y
1092
1068
# CONFIG_DEBUG_VM is not set
1069
+
# CONFIG_FORCED_INLINING is not set
1093
1070
# CONFIG_RCU_TORTURE_TEST is not set
1094
1071
CONFIG_DEBUG_STACKOVERFLOW=y
1095
1072
CONFIG_DEBUG_STACK_USAGE=y
···
1100
1073
CONFIG_XMON_DEFAULT=y
1101
1074
# CONFIG_IRQSTACKS is not set
1102
1075
CONFIG_BOOTX_TEXT=y
1076
+
# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
1077
+
# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1078
+
# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
1079
+
# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1080
+
# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1103
1081
1104
1082
#
1105
1083
# Security options
+18
-14
arch/powerpc/configs/mpc834x_sys_defconfig
+18
-14
arch/powerpc/configs/mpc834x_sys_defconfig
···
1
1
#
2
2
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.15-g461d4edf-dirty
4
-
# Fri Jan 13 11:01:47 2006
3
+
# Linux kernel version: 2.6.16-rc6
4
+
# Wed Mar 15 16:19:56 2006
5
5
#
6
6
# CONFIG_PPC64 is not set
7
7
CONFIG_PPC32=y
···
43
43
# Code maturity level options
44
44
#
45
45
CONFIG_EXPERIMENTAL=y
46
-
CONFIG_CLEAN_COMPILE=y
47
46
CONFIG_BROKEN_ON_SMP=y
48
47
CONFIG_INIT_ENV_ARG_LIMIT=32
49
48
···
188
189
#
189
190
# Networking options
190
191
#
192
+
# CONFIG_NETDEBUG is not set
191
193
CONFIG_PACKET=y
192
194
# CONFIG_PACKET_MMAP is not set
193
195
CONFIG_UNIX=y
···
226
226
# SCTP Configuration (EXPERIMENTAL)
227
227
#
228
228
# CONFIG_IP_SCTP is not set
229
+
230
+
#
231
+
# TIPC Configuration (EXPERIMENTAL)
232
+
#
233
+
# CONFIG_TIPC is not set
229
234
# CONFIG_ATM is not set
230
235
# CONFIG_BRIDGE is not set
231
236
# CONFIG_VLAN_8021Q is not set
···
516
511
#
517
512
CONFIG_SERIAL_CORE=y
518
513
CONFIG_SERIAL_CORE_CONSOLE=y
514
+
# CONFIG_SERIAL_JSM is not set
519
515
CONFIG_UNIX98_PTYS=y
520
516
CONFIG_LEGACY_PTYS=y
521
517
CONFIG_LEGACY_PTY_COUNT=256
···
621
615
# CONFIG_I2C_DEBUG_CHIP is not set
622
616
623
617
#
618
+
# SPI support
619
+
#
620
+
# CONFIG_SPI is not set
621
+
# CONFIG_SPI_MASTER is not set
622
+
623
+
#
624
624
# Dallas's 1-wire bus
625
625
#
626
626
# CONFIG_W1 is not set
···
644
632
# CONFIG_SENSORS_ASB100 is not set
645
633
# CONFIG_SENSORS_ATXP1 is not set
646
634
# CONFIG_SENSORS_DS1621 is not set
635
+
# CONFIG_SENSORS_F71805F is not set
647
636
# CONFIG_SENSORS_FSCHER is not set
648
637
# CONFIG_SENSORS_FSCPOS is not set
649
638
# CONFIG_SENSORS_GL518SM is not set
···
729
716
# CONFIG_INFINIBAND is not set
730
717
731
718
#
732
-
# SN Devices
719
+
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
733
720
#
734
721
735
722
#
···
839
826
# CONFIG_SGI_PARTITION is not set
840
827
# CONFIG_ULTRIX_PARTITION is not set
841
828
# CONFIG_SUN_PARTITION is not set
829
+
# CONFIG_KARMA_PARTITION is not set
842
830
# CONFIG_EFI_PARTITION is not set
843
831
844
832
#
···
913
899
#
914
900
# Hardware crypto devices
915
901
#
916
-
917
-
#
918
-
# SEC2.x Options
919
-
#
920
-
CONFIG_MPC8349E_SEC2x=y
921
-
922
-
#
923
-
# SEC2.x Test Options
924
-
#
925
-
CONFIG_MPC8349E_SEC2xTEST=y
+49
-28
arch/powerpc/configs/pmac32_defconfig
+49
-28
arch/powerpc/configs/pmac32_defconfig
···
1
1
#
2
2
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.15
4
-
# Sat Jan 14 16:26:08 2006
3
+
# Linux kernel version: 2.6.16-rc6
4
+
# Wed Mar 15 16:21:32 2006
5
5
#
6
6
# CONFIG_PPC64 is not set
7
7
CONFIG_PPC32=y
···
17
17
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
18
18
CONFIG_PPC_OF=y
19
19
# CONFIG_PPC_UDBG_16550 is not set
20
-
# CONFIG_CRASH_DUMP is not set
21
20
# CONFIG_GENERIC_TBSYNC is not set
21
+
# CONFIG_DEFAULT_UIMAGE is not set
22
22
23
23
#
24
24
# Processor support
···
43
43
# Code maturity level options
44
44
#
45
45
CONFIG_EXPERIMENTAL=y
46
-
CONFIG_CLEAN_COMPILE=y
47
46
CONFIG_BROKEN_ON_SMP=y
48
47
CONFIG_INIT_ENV_ARG_LIMIT=32
49
48
···
235
236
#
236
237
# Networking options
237
238
#
239
+
# CONFIG_NETDEBUG is not set
238
240
CONFIG_PACKET=y
239
241
# CONFIG_PACKET_MMAP is not set
240
242
CONFIG_UNIX=y
···
271
271
# Core Netfilter Configuration
272
272
#
273
273
# CONFIG_NETFILTER_NETLINK is not set
274
+
CONFIG_NETFILTER_XTABLES=m
275
+
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
276
+
CONFIG_NETFILTER_XT_TARGET_MARK=m
277
+
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
278
+
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
279
+
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
280
+
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
281
+
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
282
+
CONFIG_NETFILTER_XT_MATCH_HELPER=m
283
+
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
284
+
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
285
+
CONFIG_NETFILTER_XT_MATCH_MAC=m
286
+
CONFIG_NETFILTER_XT_MATCH_MARK=m
287
+
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
288
+
CONFIG_NETFILTER_XT_MATCH_REALM=m
289
+
CONFIG_NETFILTER_XT_MATCH_SCTP=m
290
+
CONFIG_NETFILTER_XT_MATCH_STATE=m
291
+
CONFIG_NETFILTER_XT_MATCH_STRING=m
292
+
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
274
293
275
294
#
276
295
# IP: Netfilter Configuration
···
307
288
CONFIG_IP_NF_PPTP=m
308
289
# CONFIG_IP_NF_QUEUE is not set
309
290
CONFIG_IP_NF_IPTABLES=m
310
-
CONFIG_IP_NF_MATCH_LIMIT=m
311
291
CONFIG_IP_NF_MATCH_IPRANGE=m
312
-
CONFIG_IP_NF_MATCH_MAC=m
313
-
CONFIG_IP_NF_MATCH_PKTTYPE=m
314
-
CONFIG_IP_NF_MATCH_MARK=m
315
292
CONFIG_IP_NF_MATCH_MULTIPORT=m
316
293
CONFIG_IP_NF_MATCH_TOS=m
317
294
CONFIG_IP_NF_MATCH_RECENT=m
318
295
CONFIG_IP_NF_MATCH_ECN=m
319
296
CONFIG_IP_NF_MATCH_DSCP=m
320
297
CONFIG_IP_NF_MATCH_AH_ESP=m
321
-
CONFIG_IP_NF_MATCH_LENGTH=m
322
298
CONFIG_IP_NF_MATCH_TTL=m
323
-
CONFIG_IP_NF_MATCH_TCPMSS=m
324
-
CONFIG_IP_NF_MATCH_HELPER=m
325
-
CONFIG_IP_NF_MATCH_STATE=m
326
-
CONFIG_IP_NF_MATCH_CONNTRACK=m
327
299
CONFIG_IP_NF_MATCH_OWNER=m
328
-
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
329
-
# CONFIG_IP_NF_MATCH_REALM is not set
330
-
# CONFIG_IP_NF_MATCH_SCTP is not set
331
-
CONFIG_IP_NF_MATCH_DCCP=m
332
-
# CONFIG_IP_NF_MATCH_COMMENT is not set
333
-
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
334
-
CONFIG_IP_NF_MATCH_STRING=m
300
+
CONFIG_IP_NF_MATCH_ADDRTYPE=m
301
+
CONFIG_IP_NF_MATCH_HASHLIMIT=m
335
302
CONFIG_IP_NF_FILTER=m
336
303
CONFIG_IP_NF_TARGET_REJECT=m
337
-
# CONFIG_IP_NF_TARGET_LOG is not set
304
+
CONFIG_IP_NF_TARGET_LOG=m
338
305
CONFIG_IP_NF_TARGET_ULOG=m
339
306
CONFIG_IP_NF_TARGET_TCPMSS=m
340
-
# CONFIG_IP_NF_TARGET_NFQUEUE is not set
341
307
CONFIG_IP_NF_NAT=m
342
308
CONFIG_IP_NF_NAT_NEEDED=y
343
309
CONFIG_IP_NF_TARGET_MASQUERADE=m
···
335
331
CONFIG_IP_NF_NAT_TFTP=m
336
332
CONFIG_IP_NF_NAT_AMANDA=m
337
333
CONFIG_IP_NF_NAT_PPTP=m
338
-
# CONFIG_IP_NF_MANGLE is not set
334
+
CONFIG_IP_NF_MANGLE=m
335
+
CONFIG_IP_NF_TARGET_TOS=m
336
+
CONFIG_IP_NF_TARGET_ECN=m
337
+
CONFIG_IP_NF_TARGET_DSCP=m
338
+
CONFIG_IP_NF_TARGET_TTL=m
339
339
CONFIG_IP_NF_RAW=m
340
-
CONFIG_IP_NF_TARGET_NOTRACK=m
341
340
CONFIG_IP_NF_ARPTABLES=m
342
341
CONFIG_IP_NF_ARPFILTER=m
343
342
CONFIG_IP_NF_ARP_MANGLE=m
···
367
360
# SCTP Configuration (EXPERIMENTAL)
368
361
#
369
362
# CONFIG_IP_SCTP is not set
363
+
364
+
#
365
+
# TIPC Configuration (EXPERIMENTAL)
366
+
#
367
+
# CONFIG_TIPC is not set
370
368
# CONFIG_ATM is not set
371
369
# CONFIG_BRIDGE is not set
372
370
# CONFIG_VLAN_8021Q is not set
···
389
377
# QoS and/or fair queueing
390
378
#
391
379
# CONFIG_NET_SCHED is not set
380
+
CONFIG_NET_CLS_ROUTE=y
392
381
393
382
#
394
383
# Network testing
···
581
568
# CONFIG_BLK_DEV_NS87415 is not set
582
569
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
583
570
CONFIG_BLK_DEV_PDC202XX_NEW=y
584
-
# CONFIG_PDC202XX_FORCE is not set
585
571
# CONFIG_BLK_DEV_SVWKS is not set
586
572
# CONFIG_BLK_DEV_SIIMAGE is not set
587
573
# CONFIG_BLK_DEV_SLC90E66 is not set
···
666
654
# CONFIG_SCSI_IPR is not set
667
655
# CONFIG_SCSI_QLOGIC_FC is not set
668
656
# CONFIG_SCSI_QLOGIC_1280 is not set
669
-
CONFIG_SCSI_QLA2XXX=y
670
-
# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
657
+
# CONFIG_SCSI_QLA_FC is not set
671
658
# CONFIG_SCSI_LPFC is not set
672
659
# CONFIG_SCSI_DC395x is not set
673
660
# CONFIG_SCSI_DC390T is not set
···
1002
991
#
1003
992
CONFIG_SERIAL_CORE=m
1004
993
CONFIG_SERIAL_PMACZILOG=m
994
+
# CONFIG_SERIAL_JSM is not set
1005
995
CONFIG_UNIX98_PTYS=y
1006
996
CONFIG_LEGACY_PTYS=y
1007
997
CONFIG_LEGACY_PTY_COUNT=256
···
1108
1096
# CONFIG_I2C_DEBUG_ALGO is not set
1109
1097
# CONFIG_I2C_DEBUG_BUS is not set
1110
1098
# CONFIG_I2C_DEBUG_CHIP is not set
1099
+
1100
+
#
1101
+
# SPI support
1102
+
#
1103
+
# CONFIG_SPI is not set
1104
+
# CONFIG_SPI_MASTER is not set
1111
1105
1112
1106
#
1113
1107
# Dallas's 1-wire bus
···
1366
1348
#
1367
1349
CONFIG_USB_HID=y
1368
1350
CONFIG_USB_HIDINPUT=y
1351
+
CONFIG_USB_HIDINPUT_POWERBOOK=y
1369
1352
# CONFIG_HID_FF is not set
1370
1353
# CONFIG_USB_HIDDEV is not set
1371
1354
# CONFIG_USB_AIPTEK is not set
···
1507
1488
# CONFIG_INFINIBAND is not set
1508
1489
1509
1490
#
1510
-
# SN Devices
1491
+
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1511
1492
#
1512
1493
1513
1494
#
···
1628
1609
# CONFIG_SGI_PARTITION is not set
1629
1610
# CONFIG_ULTRIX_PARTITION is not set
1630
1611
# CONFIG_SUN_PARTITION is not set
1612
+
# CONFIG_KARMA_PARTITION is not set
1631
1613
# CONFIG_EFI_PARTITION is not set
1632
1614
1633
1615
#
···
1712
1692
# CONFIG_DEBUG_INFO is not set
1713
1693
# CONFIG_DEBUG_FS is not set
1714
1694
# CONFIG_DEBUG_VM is not set
1695
+
# CONFIG_FORCED_INLINING is not set
1715
1696
# CONFIG_RCU_TORTURE_TEST is not set
1716
1697
CONFIG_DEBUGGER=y
1717
1698
CONFIG_XMON=y
+1
-1
arch/powerpc/configs/ppc64_defconfig
+1
-1
arch/powerpc/configs/ppc64_defconfig
···
407
407
# CONFIG_BLK_DEV_OFFBOARD is not set
408
408
CONFIG_BLK_DEV_GENERIC=y
409
409
# CONFIG_BLK_DEV_OPTI621 is not set
410
-
# CONFIG_BLK_DEV_SL82C105 is not set
410
+
CONFIG_BLK_DEV_SL82C105=y
411
411
CONFIG_BLK_DEV_IDEDMA_PCI=y
412
412
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
413
413
CONFIG_IDEDMA_PCI_AUTO=y
+3
-2
arch/powerpc/kernel/pci_64.c
+3
-2
arch/powerpc/kernel/pci_64.c
···
589
589
#endif /* CONFIG_PPC_MULTIPLATFORM */
590
590
if (mode == PCI_PROBE_NORMAL)
591
591
hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
592
-
pci_bus_add_devices(bus);
593
592
}
594
593
595
594
static int __init pcibios_init(void)
···
607
608
printk("PCI: Probing PCI hardware\n");
608
609
609
610
/* Scan all of the recorded PCI controllers. */
610
-
list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
611
+
list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
611
612
scan_phb(hose);
613
+
pci_bus_add_devices(hose->bus);
614
+
}
612
615
613
616
#ifndef CONFIG_PPC_ISERIES
614
617
if (pci_probe_only)
-10
arch/powerpc/kernel/ppc_ksyms.c
-10
arch/powerpc/kernel/ppc_ksyms.c
···
110
110
EXPORT_SYMBOL(_outsw_ns);
111
111
EXPORT_SYMBOL(_insl_ns);
112
112
EXPORT_SYMBOL(_outsl_ns);
113
-
EXPORT_SYMBOL(ioremap);
114
-
#ifdef CONFIG_44x
115
-
EXPORT_SYMBOL(ioremap64);
116
-
#endif
117
-
EXPORT_SYMBOL(__ioremap);
118
-
EXPORT_SYMBOL(iounmap);
119
-
#ifdef CONFIG_PPC32
120
-
EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
121
-
#endif
122
113
123
114
#if defined(CONFIG_PPC32) && (defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE))
124
115
EXPORT_SYMBOL(ppc_ide_md);
···
152
161
EXPORT_SYMBOL(flush_dcache_range);
153
162
154
163
#ifdef CONFIG_SMP
155
-
EXPORT_SYMBOL(smp_call_function);
156
164
#ifdef CONFIG_PPC32
157
165
EXPORT_SYMBOL(smp_hw_index);
158
166
#endif
+1
-1
arch/powerpc/kernel/rtas-rtc.c
+1
-1
arch/powerpc/kernel/rtas-rtc.c
···
52
52
error = rtas_call(rtas_token("get-time-of-day"), 0, 8, ret);
53
53
if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {
54
54
if (in_interrupt() && printk_ratelimit()) {
55
-
memset(&rtc_tm, 0, sizeof(struct rtc_time));
55
+
memset(rtc_tm, 0, sizeof(struct rtc_time));
56
56
printk(KERN_WARNING "error: reading clock"
57
57
" would delay interrupt\n");
58
58
return; /* delay not allowed */
+1
-23
arch/powerpc/kernel/rtas_pci.c
+1
-23
arch/powerpc/kernel/rtas_pci.c
···
280
280
return 0;
281
281
}
282
282
283
-
static int __devinit setup_phb(struct device_node *dev,
284
-
struct pci_controller *phb)
283
+
int __devinit setup_phb(struct device_node *dev, struct pci_controller *phb)
285
284
{
286
285
if (is_python(dev))
287
286
python_countermeasures(dev);
···
357
358
358
359
return 0;
359
360
}
360
-
361
-
struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
362
-
{
363
-
struct pci_controller *phb;
364
-
int primary;
365
-
366
-
primary = list_empty(&hose_list);
367
-
phb = pcibios_alloc_controller(dn);
368
-
if (!phb)
369
-
return NULL;
370
-
setup_phb(dn, phb);
371
-
pci_process_bridge_OF_ranges(phb, dn, primary);
372
-
373
-
pci_setup_phb_io_dynamic(phb, primary);
374
-
375
-
pci_devs_phb_init_dynamic(phb);
376
-
scan_phb(phb);
377
-
378
-
return phb;
379
-
}
380
-
EXPORT_SYMBOL(init_phb_dynamic);
381
361
382
362
/* RPA-specific bits for removing PHBs */
383
363
int pcibios_remove_root_bus(struct pci_controller *phb)
+34
-14
arch/powerpc/kernel/time.c
+34
-14
arch/powerpc/kernel/time.c
···
283
283
* the two values of tb_update_count match and are even then the
284
284
* tb_to_xs and stamp_xsec values are consistent. If not, then it
285
285
* loops back and reads them again until this criteria is met.
286
+
* We expect the caller to have done the first increment of
287
+
* vdso_data->tb_update_count already.
286
288
*/
287
-
++(vdso_data->tb_update_count);
288
-
smp_wmb();
289
289
vdso_data->tb_orig_stamp = new_tb_stamp;
290
290
vdso_data->stamp_xsec = new_stamp_xsec;
291
291
vdso_data->tb_to_xs = new_tb_to_xs;
···
310
310
unsigned long offset;
311
311
u64 new_stamp_xsec;
312
312
u64 tlen, t2x;
313
+
u64 tb, xsec_old, xsec_new;
314
+
struct gettimeofday_vars *varp;
313
315
314
316
if (__USE_RTC())
315
317
return;
316
318
tlen = current_tick_length();
317
319
offset = cur_tb - do_gtod.varp->tb_orig_stamp;
318
-
if (tlen == last_tick_len && offset < 0x80000000u) {
319
-
/* check that we're still in sync; if not, resync */
320
-
struct timeval tv;
321
-
__do_gettimeofday(&tv, cur_tb);
322
-
if (tv.tv_sec <= xtime.tv_sec &&
323
-
(tv.tv_sec < xtime.tv_sec ||
324
-
tv.tv_usec * 1000 <= xtime.tv_nsec))
325
-
return;
326
-
}
320
+
if (tlen == last_tick_len && offset < 0x80000000u)
321
+
return;
327
322
if (tlen != last_tick_len) {
328
323
t2x = mulhdu(tlen << TICKLEN_SHIFT, ticklen_to_xs);
329
324
last_tick_len = tlen;
···
327
332
new_stamp_xsec = (u64) xtime.tv_nsec * XSEC_PER_SEC;
328
333
do_div(new_stamp_xsec, 1000000000);
329
334
new_stamp_xsec += (u64) xtime.tv_sec * XSEC_PER_SEC;
335
+
336
+
++vdso_data->tb_update_count;
337
+
smp_mb();
338
+
339
+
/*
340
+
* Make sure time doesn't go backwards for userspace gettimeofday.
341
+
*/
342
+
tb = get_tb();
343
+
varp = do_gtod.varp;
344
+
xsec_old = mulhdu(tb - varp->tb_orig_stamp, varp->tb_to_xs)
345
+
+ varp->stamp_xsec;
346
+
xsec_new = mulhdu(tb - cur_tb, t2x) + new_stamp_xsec;
347
+
if (xsec_new < xsec_old)
348
+
new_stamp_xsec += xsec_old - xsec_new;
349
+
330
350
update_gtod(cur_tb, new_stamp_xsec, t2x);
331
351
}
332
352
···
574
564
}
575
565
#endif
576
566
567
+
/* Make userspace gettimeofday spin until we're done. */
568
+
++vdso_data->tb_update_count;
569
+
smp_mb();
570
+
577
571
/*
578
572
* Subtract off the number of nanoseconds since the
579
573
* beginning of the last tick.
···
738
724
* It is computed as:
739
725
* ticklen_to_xs = 2^N / (tb_ticks_per_jiffy * 1e9)
740
726
* where N = 64 + 20 - TICKLEN_SCALE - TICKLEN_SHIFT
741
-
* so as to give the result as a 0.64 fixed-point fraction.
727
+
* which turns out to be N = 51 - SHIFT_HZ.
728
+
* This gives the result as a 0.64 fixed-point fraction.
729
+
* That value is reduced by an offset amounting to 1 xsec per
730
+
* 2^31 timebase ticks to avoid problems with time going backwards
731
+
* by 1 xsec when we do timer_recalc_offset due to losing the
732
+
* fractional xsec. That offset is equal to ppc_tb_freq/2^51
733
+
* since there are 2^20 xsec in a second.
742
734
*/
743
-
div128_by_32(1ULL << (64 + 20 - TICKLEN_SCALE - TICKLEN_SHIFT), 0,
744
-
tb_ticks_per_jiffy, &res);
735
+
div128_by_32((1ULL << 51) - ppc_tb_freq, 0,
736
+
tb_ticks_per_jiffy << SHIFT_HZ, &res);
745
737
div128_by_32(res.result_high, res.result_low, NSEC_PER_SEC, &res);
746
738
ticklen_to_xs = res.result_low;
747
739
+5
arch/powerpc/mm/pgtable_32.c
+5
arch/powerpc/mm/pgtable_32.c
···
37
37
38
38
unsigned long ioremap_base;
39
39
unsigned long ioremap_bot;
40
+
EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
40
41
int io_bat_index;
41
42
42
43
#if defined(CONFIG_6xx) || defined(CONFIG_POWER3)
···
154
153
{
155
154
return __ioremap(addr, size, _PAGE_NO_CACHE);
156
155
}
156
+
EXPORT_SYMBOL(ioremap64);
157
157
158
158
void __iomem *
159
159
ioremap(phys_addr_t addr, unsigned long size)
···
164
162
return ioremap64(addr64, size);
165
163
}
166
164
#endif /* CONFIG_PHYS_64BIT */
165
+
EXPORT_SYMBOL(ioremap);
167
166
168
167
void __iomem *
169
168
__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
···
250
247
out:
251
248
return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK));
252
249
}
250
+
EXPORT_SYMBOL(__ioremap);
253
251
254
252
void iounmap(volatile void __iomem *addr)
255
253
{
···
263
259
if (addr > high_memory && (unsigned long) addr < ioremap_bot)
264
260
vunmap((void *) (PAGE_MASK & (unsigned long)addr));
265
261
}
262
+
EXPORT_SYMBOL(iounmap);
266
263
267
264
void __iomem *ioport_map(unsigned long port, unsigned int len)
268
265
{
+4
-5
arch/powerpc/platforms/powermac/feature.c
+4
-5
arch/powerpc/platforms/powermac/feature.c
···
2491
2491
pmac_mb.model_id = PMAC_TYPE_COMET;
2492
2492
iounmap(mach_id_ptr);
2493
2493
}
2494
-
#endif /* CONFIG_POWER4 */
2495
2494
2496
-
#ifdef CONFIG_6xx
2497
2495
/* Set default value of powersave_nap on machines that support it.
2498
2496
* It appears that uninorth rev 3 has a problem with it, we don't
2499
2497
* enable it on those. In theory, the flush-on-lock property is
···
2520
2522
* NAP mode
2521
2523
*/
2522
2524
powersave_lowspeed = 1;
2523
-
#endif /* CONFIG_6xx */
2524
-
#ifdef CONFIG_POWER4
2525
+
2526
+
#else /* CONFIG_POWER4 */
2525
2527
powersave_nap = 1;
2526
-
#endif
2528
+
#endif /* CONFIG_POWER4 */
2529
+
2527
2530
/* Check for "mobile" machine */
2528
2531
if (model && (strncmp(model, "PowerBook", 9) == 0
2529
2532
|| strncmp(model, "iBook", 5) == 0))
-4
arch/powerpc/platforms/powermac/setup.c
-4
arch/powerpc/platforms/powermac/setup.c
···
621
621
/* Probe motherboard chipset */
622
622
pmac_feature_init();
623
623
624
-
/* We can NAP */
625
-
powersave_nap = 1;
626
-
printk(KERN_INFO "Using native/NAP idle loop\n");
627
-
628
624
/* Initialize debug stuff */
629
625
udbg_scc_init(!!strstr(cmd_line, "sccdbg"));
630
626
udbg_adb_init(!!strstr(cmd_line, "btextdbg"));
+1
-1
arch/powerpc/platforms/pseries/Kconfig
+1
-1
arch/powerpc/platforms/pseries/Kconfig
+28
arch/powerpc/platforms/pseries/pci_dlpar.c
+28
arch/powerpc/platforms/pseries/pci_dlpar.c
···
27
27
28
28
#include <linux/pci.h>
29
29
#include <asm/pci-bridge.h>
30
+
#include <asm/ppc-pci.h>
30
31
31
32
static struct pci_bus *
32
33
find_bus_among_children(struct pci_bus *bus,
···
180
179
}
181
180
}
182
181
EXPORT_SYMBOL_GPL(pcibios_add_pci_devices);
182
+
183
+
struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
184
+
{
185
+
struct pci_controller *phb;
186
+
int primary;
187
+
188
+
primary = list_empty(&hose_list);
189
+
phb = pcibios_alloc_controller(dn);
190
+
if (!phb)
191
+
return NULL;
192
+
setup_phb(dn, phb);
193
+
pci_process_bridge_OF_ranges(phb, dn, 0);
194
+
195
+
pci_setup_phb_io_dynamic(phb, primary);
196
+
197
+
pci_devs_phb_init_dynamic(phb);
198
+
199
+
if (dn->child)
200
+
eeh_add_device_tree_early(dn);
201
+
202
+
scan_phb(phb);
203
+
pcibios_fixup_new_pci_devices(phb->bus, 0);
204
+
pci_bus_add_devices(phb->bus);
205
+
206
+
return phb;
207
+
}
208
+
EXPORT_SYMBOL_GPL(init_phb_dynamic);
+1
include/asm-powerpc/ppc-pci.h
+1
include/asm-powerpc/ppc-pci.h