Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 485ff09990416c75ae9593ddc71619939ab9dd51

Authored by Linus Torvalds
2 parents 5466eb5d0a 1ae5db3742
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

Showing 19 changed files Side-by-side Diff

arch/powerpc/Kconfig
Diff comments   View file @ 485ff09
... ... @@ -580,7 +580,7 @@
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.
arch/powerpc/boot/crt0.S
Diff comments   View file @ 485ff09
... ... @@ -45,7 +45,8 @@
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
... ... @@ -53,7 +54,7 @@
53 54 4: dcbf r0,r9
54 55 icbi r0,r9
55 56 addi r9,r9,0x20
56   - cmplwi 0,r9,8
  57 + cmplw cr0,r9,r8
57 58 blt 4b
58 59 sync
59 60 isync
arch/powerpc/configs/cell_defconfig
Diff comments   View file @ 485ff09
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,6 +16,10 @@
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
... ... @@ -33,7 +37,6 @@
33 37 # Code maturity level options
34 38 #
35 39 CONFIG_EXPERIMENTAL=y
36   -CONFIG_CLEAN_COMPILE=y
37 40 CONFIG_LOCK_KERNEL=y
38 41 CONFIG_INIT_ENV_ARG_LIMIT=32
39 42  
... ... @@ -48,8 +51,6 @@
48 51 # CONFIG_BSD_PROCESS_ACCT is not set
49 52 CONFIG_SYSCTL=y
50 53 # CONFIG_AUDIT is not set
51   -CONFIG_HOTPLUG=y
52   -CONFIG_KOBJECT_UEVENT=y
53 54 # CONFIG_IKCONFIG is not set
54 55 # CONFIG_CPUSETS is not set
55 56 CONFIG_INITRAMFS_SOURCE=""
56 57  
... ... @@ -58,8 +59,10 @@
58 59 CONFIG_KALLSYMS=y
59 60 # CONFIG_KALLSYMS_ALL is not set
60 61 # CONFIG_KALLSYMS_EXTRA_PASS is not set
  62 +CONFIG_HOTPLUG=y
61 63 CONFIG_PRINTK=y
62 64 CONFIG_BUG=y
  65 +CONFIG_ELF_CORE=y
63 66 CONFIG_BASE_FULL=y
64 67 CONFIG_FUTEX=y
65 68 CONFIG_EPOLL=y
66 69  
... ... @@ -68,8 +71,10 @@
68 71 CONFIG_CC_ALIGN_LABELS=0
69 72 CONFIG_CC_ALIGN_LOOPS=0
70 73 CONFIG_CC_ALIGN_JUMPS=0
  74 +CONFIG_SLAB=y
71 75 # CONFIG_TINY_SHMEM is not set
72 76 CONFIG_BASE_SMALL=0
  77 +# CONFIG_SLOB is not set
73 78  
74 79 #
75 80 # Loadable module support
... ... @@ -111,7 +116,6 @@
111 116 # CONFIG_PPC_PMAC is not set
112 117 # CONFIG_PPC_MAPLE is not set
113 118 CONFIG_PPC_CELL=y
114   -CONFIG_PPC_OF=y
115 119 # CONFIG_U3_DART is not set
116 120 CONFIG_PPC_RTAS=y
117 121 # CONFIG_RTAS_ERROR_LOGGING is not set
118 122  
... ... @@ -120,11 +124,15 @@
120 124 CONFIG_MMIO_NVRAM=y
121 125 CONFIG_CELL_IIC=y
122 126 # CONFIG_PPC_MPC106 is not set
123   -# CONFIG_GENERIC_TBSYNC is not set
124 127 # CONFIG_CPU_FREQ is not set
125 128 # CONFIG_WANT_EARLY_SERIAL is not set
126 129  
127 130 #
  131 +# Cell Broadband Engine options
  132 +#
  133 +CONFIG_SPU_FS=y
  134 +
  135 +#
128 136 # Kernel options
129 137 #
130 138 # CONFIG_HZ_100 is not set
... ... @@ -140,6 +148,7 @@
140 148 CONFIG_FORCE_MAX_ZONEORDER=13
141 149 # CONFIG_IOMMU_VMERGE is not set
142 150 CONFIG_KEXEC=y
  151 +# CONFIG_CRASH_DUMP is not set
143 152 CONFIG_IRQ_ALL_CPUS=y
144 153 # CONFIG_NUMA is not set
145 154 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
... ... @@ -191,6 +200,7 @@
191 200 #
192 201 # Networking options
193 202 #
  203 +# CONFIG_NETDEBUG is not set
194 204 CONFIG_PACKET=y
195 205 # CONFIG_PACKET_MMAP is not set
196 206 CONFIG_UNIX=y
... ... @@ -234,6 +244,25 @@
234 244 # Core Netfilter Configuration
235 245 #
236 246 # CONFIG_NETFILTER_NETLINK is not set
  247 +CONFIG_NETFILTER_XTABLES=m
  248 +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  249 +CONFIG_NETFILTER_XT_TARGET_MARK=m
  250 +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  251 +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  252 +CONFIG_NETFILTER_XT_MATCH_COMMENT=m
  253 +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  254 +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
  255 +CONFIG_NETFILTER_XT_MATCH_HELPER=m
  256 +CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  257 +CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  258 +CONFIG_NETFILTER_XT_MATCH_MAC=m
  259 +CONFIG_NETFILTER_XT_MATCH_MARK=m
  260 +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  261 +CONFIG_NETFILTER_XT_MATCH_REALM=m
  262 +CONFIG_NETFILTER_XT_MATCH_SCTP=m
  263 +CONFIG_NETFILTER_XT_MATCH_STATE=m
  264 +CONFIG_NETFILTER_XT_MATCH_STRING=m
  265 +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
237 266  
238 267 #
239 268 # IP: Netfilter Configuration
240 269  
241 270  
242 271  
243 272  
244 273  
245 274  
... ... @@ -251,37 +280,23 @@
251 280 # CONFIG_IP_NF_PPTP is not set
252 281 CONFIG_IP_NF_QUEUE=m
253 282 CONFIG_IP_NF_IPTABLES=m
254   -CONFIG_IP_NF_MATCH_LIMIT=m
255 283 CONFIG_IP_NF_MATCH_IPRANGE=m
256   -CONFIG_IP_NF_MATCH_MAC=m
257   -CONFIG_IP_NF_MATCH_PKTTYPE=m
258   -CONFIG_IP_NF_MATCH_MARK=m
259 284 CONFIG_IP_NF_MATCH_MULTIPORT=m
260 285 CONFIG_IP_NF_MATCH_TOS=m
261 286 CONFIG_IP_NF_MATCH_RECENT=m
262 287 CONFIG_IP_NF_MATCH_ECN=m
263 288 CONFIG_IP_NF_MATCH_DSCP=m
264 289 CONFIG_IP_NF_MATCH_AH_ESP=m
265   -CONFIG_IP_NF_MATCH_LENGTH=m
266 290 CONFIG_IP_NF_MATCH_TTL=m
267   -CONFIG_IP_NF_MATCH_TCPMSS=m
268   -CONFIG_IP_NF_MATCH_HELPER=m
269   -CONFIG_IP_NF_MATCH_STATE=m
270   -CONFIG_IP_NF_MATCH_CONNTRACK=m
271 291 CONFIG_IP_NF_MATCH_OWNER=m
272 292 CONFIG_IP_NF_MATCH_ADDRTYPE=m
273   -CONFIG_IP_NF_MATCH_REALM=m
274   -CONFIG_IP_NF_MATCH_SCTP=m
275   -# CONFIG_IP_NF_MATCH_DCCP is not set
276   -CONFIG_IP_NF_MATCH_COMMENT=m
277 293 CONFIG_IP_NF_MATCH_HASHLIMIT=m
278   -CONFIG_IP_NF_MATCH_STRING=m
  294 +CONFIG_IP_NF_MATCH_POLICY=m
279 295 CONFIG_IP_NF_FILTER=m
280 296 CONFIG_IP_NF_TARGET_REJECT=m
281 297 CONFIG_IP_NF_TARGET_LOG=m
282 298 CONFIG_IP_NF_TARGET_ULOG=m
283 299 CONFIG_IP_NF_TARGET_TCPMSS=m
284   -CONFIG_IP_NF_TARGET_NFQUEUE=m
285 300 CONFIG_IP_NF_NAT=m
286 301 CONFIG_IP_NF_NAT_NEEDED=y
287 302 CONFIG_IP_NF_TARGET_MASQUERADE=m
288 303  
... ... @@ -297,11 +312,8 @@
297 312 CONFIG_IP_NF_TARGET_TOS=m
298 313 CONFIG_IP_NF_TARGET_ECN=m
299 314 CONFIG_IP_NF_TARGET_DSCP=m
300   -CONFIG_IP_NF_TARGET_MARK=m
301   -CONFIG_IP_NF_TARGET_CLASSIFY=m
302 315 CONFIG_IP_NF_TARGET_TTL=m
303 316 CONFIG_IP_NF_RAW=m
304   -CONFIG_IP_NF_TARGET_NOTRACK=m
305 317 CONFIG_IP_NF_ARPTABLES=m
306 318 CONFIG_IP_NF_ARPFILTER=m
307 319 CONFIG_IP_NF_ARP_MANGLE=m
... ... @@ -311,7 +323,6 @@
311 323 #
312 324 # CONFIG_IP6_NF_QUEUE is not set
313 325 # CONFIG_IP6_NF_IPTABLES is not set
314   -# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
315 326  
316 327 #
317 328 # DCCP Configuration (EXPERIMENTAL)
... ... @@ -322,6 +333,11 @@
322 333 # SCTP Configuration (EXPERIMENTAL)
323 334 #
324 335 # CONFIG_IP_SCTP is not set
  336 +
  337 +#
  338 +# TIPC Configuration (EXPERIMENTAL)
  339 +#
  340 +# CONFIG_TIPC is not set
325 341 # CONFIG_ATM is not set
326 342 # CONFIG_BRIDGE is not set
327 343 # CONFIG_VLAN_8021Q is not set
328 344  
... ... @@ -540,9 +556,11 @@
540 556 # CONFIG_R8169 is not set
541 557 # CONFIG_SIS190 is not set
542 558 CONFIG_SKGE=m
  559 +# CONFIG_SKY2 is not set
543 560 # CONFIG_SK98LIN is not set
544 561 # CONFIG_TIGON3 is not set
545 562 # CONFIG_BNX2 is not set
  563 +CONFIG_SPIDER_NET=y
546 564 # CONFIG_MV643XX_ETH is not set
547 565  
548 566 #
549 567  
550 568  
... ... @@ -628,13 +646,16 @@
628 646 CONFIG_VT_CONSOLE=y
629 647 CONFIG_HW_CONSOLE=y
630 648 CONFIG_SERIAL_NONSTANDARD=y
  649 +# CONFIG_COMPUTONE is not set
631 650 # CONFIG_ROCKETPORT is not set
632 651 # CONFIG_CYCLADES is not set
633 652 # CONFIG_DIGIEPCA is not set
  653 +# CONFIG_MOXA_INTELLIO is not set
634 654 # CONFIG_MOXA_SMARTIO is not set
635 655 # CONFIG_ISI is not set
636 656 # CONFIG_SYNCLINK is not set
637 657 # CONFIG_SYNCLINKMP is not set
  658 +# CONFIG_SYNCLINK_GT is not set
638 659 # CONFIG_N_HDLC is not set
639 660 # CONFIG_SPECIALIX is not set
640 661 # CONFIG_SX is not set
... ... @@ -646,6 +667,7 @@
646 667 CONFIG_SERIAL_8250=y
647 668 CONFIG_SERIAL_8250_CONSOLE=y
648 669 CONFIG_SERIAL_8250_NR_UARTS=4
  670 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4
649 671 # CONFIG_SERIAL_8250_EXTENDED is not set
650 672  
651 673 #
... ... @@ -756,6 +778,12 @@
756 778 # CONFIG_I2C_DEBUG_CHIP is not set
757 779  
758 780 #
  781 +# SPI support
  782 +#
  783 +# CONFIG_SPI is not set
  784 +# CONFIG_SPI_MASTER is not set
  785 +
  786 +#
759 787 # Dallas's 1-wire bus
760 788 #
761 789 # CONFIG_W1 is not set
... ... @@ -827,7 +855,7 @@
827 855 # CONFIG_INFINIBAND is not set
828 856  
829 857 #
830   -# SN Devices
  858 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
831 859 #
832 860  
833 861 #
... ... @@ -847,6 +875,7 @@
847 875 # CONFIG_JFS_FS is not set
848 876 CONFIG_FS_POSIX_ACL=y
849 877 # CONFIG_XFS_FS is not set
  878 +# CONFIG_OCFS2_FS is not set
850 879 # CONFIG_MINIX_FS is not set
851 880 # CONFIG_ROMFS_FS is not set
852 881 CONFIG_INOTIFY=y
... ... @@ -886,6 +915,7 @@
886 915 CONFIG_HUGETLB_PAGE=y
887 916 CONFIG_RAMFS=y
888 917 # CONFIG_RELAYFS_FS is not set
  918 +# CONFIG_CONFIGFS_FS is not set
889 919  
890 920 #
891 921 # Miscellaneous filesystems
... ... @@ -951,6 +981,7 @@
951 981 # CONFIG_SGI_PARTITION is not set
952 982 # CONFIG_ULTRIX_PARTITION is not set
953 983 # CONFIG_SUN_PARTITION is not set
  984 +# CONFIG_KARMA_PARTITION is not set
954 985 CONFIG_EFI_PARTITION=y
955 986  
956 987 #
957 988  
958 989  
959 990  
... ... @@ -1021,18 +1052,20 @@
1021 1052 # Kernel hacking
1022 1053 #
1023 1054 # CONFIG_PRINTK_TIME is not set
1024   -CONFIG_DEBUG_KERNEL=y
1025 1055 CONFIG_MAGIC_SYSRQ=y
  1056 +CONFIG_DEBUG_KERNEL=y
1026 1057 CONFIG_LOG_BUF_SHIFT=15
1027 1058 CONFIG_DETECT_SOFTLOCKUP=y
1028 1059 # CONFIG_SCHEDSTATS is not set
1029 1060 # CONFIG_DEBUG_SLAB is not set
  1061 +# CONFIG_DEBUG_MUTEXES is not set
1030 1062 # CONFIG_DEBUG_SPINLOCK is not set
1031 1063 CONFIG_DEBUG_SPINLOCK_SLEEP=y
1032 1064 # CONFIG_DEBUG_KOBJECT is not set
1033 1065 # CONFIG_DEBUG_INFO is not set
1034 1066 CONFIG_DEBUG_FS=y
1035 1067 # CONFIG_DEBUG_VM is not set
  1068 +# CONFIG_FORCED_INLINING is not set
1036 1069 # CONFIG_RCU_TORTURE_TEST is not set
1037 1070 # CONFIG_DEBUG_STACKOVERFLOW is not set
1038 1071 # CONFIG_DEBUG_STACK_USAGE is not set
... ... @@ -1040,6 +1073,11 @@
1040 1073 # CONFIG_XMON is not set
1041 1074 CONFIG_IRQSTACKS=y
1042 1075 # CONFIG_BOOTX_TEXT is not set
  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
1043 1081  
1044 1082 #
1045 1083 # Security options
arch/powerpc/configs/iseries_defconfig
Diff comments   View file @ 485ff09
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,6 +16,10 @@
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
... ... @@ -33,7 +37,6 @@
33 37 # Code maturity level options
34 38 #
35 39 CONFIG_EXPERIMENTAL=y
36   -CONFIG_CLEAN_COMPILE=y
37 40 CONFIG_LOCK_KERNEL=y
38 41 CONFIG_INIT_ENV_ARG_LIMIT=32
39 42  
... ... @@ -49,8 +52,6 @@
49 52 CONFIG_SYSCTL=y
50 53 CONFIG_AUDIT=y
51 54 CONFIG_AUDITSYSCALL=y
52   -CONFIG_HOTPLUG=y
53   -CONFIG_KOBJECT_UEVENT=y
54 55 CONFIG_IKCONFIG=y
55 56 CONFIG_IKCONFIG_PROC=y
56 57 # CONFIG_CPUSETS is not set
57 58  
... ... @@ -60,8 +61,10 @@
60 61 CONFIG_KALLSYMS=y
61 62 # CONFIG_KALLSYMS_ALL is not set
62 63 # CONFIG_KALLSYMS_EXTRA_PASS is not set
  64 +CONFIG_HOTPLUG=y
63 65 CONFIG_PRINTK=y
64 66 CONFIG_BUG=y
  67 +CONFIG_ELF_CORE=y
65 68 CONFIG_BASE_FULL=y
66 69 CONFIG_FUTEX=y
67 70 CONFIG_EPOLL=y
68 71  
... ... @@ -70,8 +73,10 @@
70 73 CONFIG_CC_ALIGN_LABELS=0
71 74 CONFIG_CC_ALIGN_LOOPS=0
72 75 CONFIG_CC_ALIGN_JUMPS=0
  76 +CONFIG_SLAB=y
73 77 # CONFIG_TINY_SHMEM is not set
74 78 CONFIG_BASE_SMALL=0
  79 +# CONFIG_SLOB is not set
75 80  
76 81 #
77 82 # Loadable module support
... ... @@ -113,7 +118,6 @@
113 118 # CONFIG_MMIO_NVRAM is not set
114 119 CONFIG_IBMVIO=y
115 120 # CONFIG_PPC_MPC106 is not set
116   -# CONFIG_GENERIC_TBSYNC is not set
117 121 # CONFIG_CPU_FREQ is not set
118 122 # CONFIG_WANT_EARLY_SERIAL is not set
119 123  
... ... @@ -183,6 +187,7 @@
183 187 #
184 188 # Networking options
185 189 #
  190 +# CONFIG_NETDEBUG is not set
186 191 CONFIG_PACKET=y
187 192 # CONFIG_PACKET_MMAP is not set
188 193 CONFIG_UNIX=y
... ... @@ -220,6 +225,28 @@
220 225 # Core Netfilter Configuration
221 226 #
222 227 # CONFIG_NETFILTER_NETLINK is not set
  228 +CONFIG_NETFILTER_XTABLES=m
  229 +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  230 +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
  231 +CONFIG_NETFILTER_XT_TARGET_MARK=m
  232 +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
  233 +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  234 +CONFIG_NETFILTER_XT_MATCH_COMMENT=m
  235 +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
  236 +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
  237 +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
  238 +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
  239 +CONFIG_NETFILTER_XT_MATCH_HELPER=m
  240 +CONFIG_NETFILTER_XT_MATCH_LENGTH=m
  241 +CONFIG_NETFILTER_XT_MATCH_LIMIT=m
  242 +CONFIG_NETFILTER_XT_MATCH_MAC=m
  243 +CONFIG_NETFILTER_XT_MATCH_MARK=m
  244 +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
  245 +CONFIG_NETFILTER_XT_MATCH_REALM=m
  246 +CONFIG_NETFILTER_XT_MATCH_SCTP=m
  247 +CONFIG_NETFILTER_XT_MATCH_STATE=m
  248 +CONFIG_NETFILTER_XT_MATCH_STRING=m
  249 +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
223 250  
224 251 #
225 252 # IP: Netfilter Configuration
226 253  
227 254  
228 255  
229 256  
230 257  
231 258  
... ... @@ -237,39 +264,23 @@
237 264 # CONFIG_IP_NF_PPTP is not set
238 265 CONFIG_IP_NF_QUEUE=m
239 266 CONFIG_IP_NF_IPTABLES=m
240   -CONFIG_IP_NF_MATCH_LIMIT=m
241 267 CONFIG_IP_NF_MATCH_IPRANGE=m
242   -CONFIG_IP_NF_MATCH_MAC=m
243   -CONFIG_IP_NF_MATCH_PKTTYPE=m
244   -CONFIG_IP_NF_MATCH_MARK=m
245 268 CONFIG_IP_NF_MATCH_MULTIPORT=m
246 269 CONFIG_IP_NF_MATCH_TOS=m
247 270 CONFIG_IP_NF_MATCH_RECENT=m
248 271 CONFIG_IP_NF_MATCH_ECN=m
249 272 CONFIG_IP_NF_MATCH_DSCP=m
250 273 CONFIG_IP_NF_MATCH_AH_ESP=m
251   -CONFIG_IP_NF_MATCH_LENGTH=m
252 274 CONFIG_IP_NF_MATCH_TTL=m
253   -CONFIG_IP_NF_MATCH_TCPMSS=m
254   -CONFIG_IP_NF_MATCH_HELPER=m
255   -CONFIG_IP_NF_MATCH_STATE=m
256   -CONFIG_IP_NF_MATCH_CONNTRACK=m
257 275 CONFIG_IP_NF_MATCH_OWNER=m
258 276 CONFIG_IP_NF_MATCH_ADDRTYPE=m
259   -CONFIG_IP_NF_MATCH_REALM=m
260   -CONFIG_IP_NF_MATCH_SCTP=m
261   -# CONFIG_IP_NF_MATCH_DCCP is not set
262   -CONFIG_IP_NF_MATCH_COMMENT=m
263   -CONFIG_IP_NF_MATCH_CONNMARK=m
264   -CONFIG_IP_NF_MATCH_CONNBYTES=m
265 277 CONFIG_IP_NF_MATCH_HASHLIMIT=m
266   -CONFIG_IP_NF_MATCH_STRING=m
  278 +CONFIG_IP_NF_MATCH_POLICY=m
267 279 CONFIG_IP_NF_FILTER=m
268 280 CONFIG_IP_NF_TARGET_REJECT=m
269 281 CONFIG_IP_NF_TARGET_LOG=m
270 282 CONFIG_IP_NF_TARGET_ULOG=m
271 283 CONFIG_IP_NF_TARGET_TCPMSS=m
272   -CONFIG_IP_NF_TARGET_NFQUEUE=m
273 284 CONFIG_IP_NF_NAT=m
274 285 CONFIG_IP_NF_NAT_NEEDED=y
275 286 CONFIG_IP_NF_TARGET_MASQUERADE=m
276 287  
277 288  
... ... @@ -285,13 +296,9 @@
285 296 CONFIG_IP_NF_TARGET_TOS=m
286 297 CONFIG_IP_NF_TARGET_ECN=m
287 298 CONFIG_IP_NF_TARGET_DSCP=m
288   -CONFIG_IP_NF_TARGET_MARK=m
289   -CONFIG_IP_NF_TARGET_CLASSIFY=m
290 299 CONFIG_IP_NF_TARGET_TTL=m
291   -CONFIG_IP_NF_TARGET_CONNMARK=m
292 300 CONFIG_IP_NF_TARGET_CLUSTERIP=m
293 301 CONFIG_IP_NF_RAW=m
294   -CONFIG_IP_NF_TARGET_NOTRACK=m
295 302 CONFIG_IP_NF_ARPTABLES=m
296 303 CONFIG_IP_NF_ARPFILTER=m
297 304 CONFIG_IP_NF_ARP_MANGLE=m
... ... @@ -305,6 +312,11 @@
305 312 # SCTP Configuration (EXPERIMENTAL)
306 313 #
307 314 # CONFIG_IP_SCTP is not set
  315 +
  316 +#
  317 +# TIPC Configuration (EXPERIMENTAL)
  318 +#
  319 +# CONFIG_TIPC is not set
308 320 # CONFIG_ATM is not set
309 321 # CONFIG_BRIDGE is not set
310 322 # CONFIG_VLAN_8021Q is not set
... ... @@ -451,13 +463,7 @@
451 463 # CONFIG_SCSI_IPR is not set
452 464 # CONFIG_SCSI_QLOGIC_FC is not set
453 465 # CONFIG_SCSI_QLOGIC_1280 is not set
454   -CONFIG_SCSI_QLA2XXX=y
455   -# CONFIG_SCSI_QLA21XX is not set
456   -# CONFIG_SCSI_QLA22XX is not set
457   -# CONFIG_SCSI_QLA2300 is not set
458   -# CONFIG_SCSI_QLA2322 is not set
459   -# CONFIG_SCSI_QLA6312 is not set
460   -# CONFIG_SCSI_QLA24XX is not set
  466 +# CONFIG_SCSI_QLA_FC is not set
461 467 # CONFIG_SCSI_LPFC is not set
462 468 # CONFIG_SCSI_DC395x is not set
463 469 # CONFIG_SCSI_DC390T is not set
... ... @@ -574,6 +580,7 @@
574 580 # CONFIG_R8169 is not set
575 581 # CONFIG_SIS190 is not set
576 582 # CONFIG_SKGE is not set
  583 +# CONFIG_SKY2 is not set
577 584 # CONFIG_SK98LIN is not set
578 585 # CONFIG_VIA_VELOCITY is not set
579 586 # CONFIG_TIGON3 is not set
... ... @@ -723,6 +730,12 @@
723 730 # CONFIG_I2C is not set
724 731  
725 732 #
  733 +# SPI support
  734 +#
  735 +# CONFIG_SPI is not set
  736 +# CONFIG_SPI_MASTER is not set
  737 +
  738 +#
726 739 # Dallas's 1-wire bus
727 740 #
728 741 # CONFIG_W1 is not set
... ... @@ -788,7 +801,7 @@
788 801 # CONFIG_INFINIBAND is not set
789 802  
790 803 #
791   -# SN Devices
  804 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
792 805 #
793 806  
794 807 #
... ... @@ -825,6 +838,7 @@
825 838 CONFIG_XFS_SECURITY=y
826 839 CONFIG_XFS_POSIX_ACL=y
827 840 # CONFIG_XFS_RT is not set
  841 +# CONFIG_OCFS2_FS is not set
828 842 # CONFIG_MINIX_FS is not set
829 843 # CONFIG_ROMFS_FS is not set
830 844 CONFIG_INOTIFY=y
... ... @@ -865,6 +879,7 @@
865 879 # CONFIG_HUGETLB_PAGE is not set
866 880 CONFIG_RAMFS=y
867 881 # CONFIG_RELAYFS_FS is not set
  882 +# CONFIG_CONFIGFS_FS is not set
868 883  
869 884 #
870 885 # Miscellaneous filesystems
871 886  
872 887  
873 888  
874 889  
875 890  
... ... @@ -993,31 +1008,36 @@
993 1008 #
994 1009 # Instrumentation Support
995 1010 #
996   -CONFIG_PROFILING=y
997   -CONFIG_OPROFILE=y
998 1011 # CONFIG_KPROBES is not set
999 1012  
1000 1013 #
1001 1014 # Kernel hacking
1002 1015 #
1003 1016 # CONFIG_PRINTK_TIME is not set
1004   -CONFIG_DEBUG_KERNEL=y
1005 1017 CONFIG_MAGIC_SYSRQ=y
  1018 +CONFIG_DEBUG_KERNEL=y
1006 1019 CONFIG_LOG_BUF_SHIFT=17
1007 1020 CONFIG_DETECT_SOFTLOCKUP=y
1008 1021 # CONFIG_SCHEDSTATS is not set
1009 1022 # CONFIG_DEBUG_SLAB is not set
  1023 +# CONFIG_DEBUG_MUTEXES is not set
1010 1024 # CONFIG_DEBUG_SPINLOCK is not set
1011 1025 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1012 1026 # CONFIG_DEBUG_KOBJECT is not set
1013 1027 # CONFIG_DEBUG_INFO is not set
1014 1028 CONFIG_DEBUG_FS=y
1015 1029 # CONFIG_DEBUG_VM is not set
  1030 +# CONFIG_FORCED_INLINING is not set
1016 1031 # CONFIG_RCU_TORTURE_TEST is not set
1017 1032 CONFIG_DEBUG_STACKOVERFLOW=y
1018 1033 CONFIG_DEBUG_STACK_USAGE=y
1019 1034 # CONFIG_DEBUGGER is not set
1020 1035 CONFIG_IRQSTACKS=y
  1036 +# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
  1037 +# CONFIG_PPC_EARLY_DEBUG_G5 is not set
  1038 +# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
  1039 +# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
  1040 +# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1021 1041  
1022 1042 #
1023 1043 # Security options
arch/powerpc/configs/maple_defconfig
Diff comments   View file @ 485ff09
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,6 +16,10 @@
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
... ... @@ -32,7 +36,6 @@
32 36 # Code maturity level options
33 37 #
34 38 CONFIG_EXPERIMENTAL=y
35   -CONFIG_CLEAN_COMPILE=y
36 39 CONFIG_LOCK_KERNEL=y
37 40 CONFIG_INIT_ENV_ARG_LIMIT=32
38 41  
... ... @@ -47,8 +50,6 @@
47 50 # CONFIG_BSD_PROCESS_ACCT is not set
48 51 CONFIG_SYSCTL=y
49 52 # CONFIG_AUDIT is not set
50   -# CONFIG_HOTPLUG is not set
51   -CONFIG_KOBJECT_UEVENT=y
52 53 CONFIG_IKCONFIG=y
53 54 CONFIG_IKCONFIG_PROC=y
54 55 # CONFIG_CPUSETS is not set
55 56  
... ... @@ -58,8 +59,10 @@
58 59 CONFIG_KALLSYMS=y
59 60 CONFIG_KALLSYMS_ALL=y
60 61 # CONFIG_KALLSYMS_EXTRA_PASS is not set
  62 +CONFIG_HOTPLUG=y
61 63 CONFIG_PRINTK=y
62 64 CONFIG_BUG=y
  65 +CONFIG_ELF_CORE=y
63 66 CONFIG_BASE_FULL=y
64 67 CONFIG_FUTEX=y
65 68 CONFIG_EPOLL=y
66 69  
... ... @@ -68,8 +71,10 @@
68 71 CONFIG_CC_ALIGN_LABELS=0
69 72 CONFIG_CC_ALIGN_LOOPS=0
70 73 CONFIG_CC_ALIGN_JUMPS=0
  74 +CONFIG_SLAB=y
71 75 # CONFIG_TINY_SHMEM is not set
72 76 CONFIG_BASE_SMALL=0
  77 +# CONFIG_SLOB is not set
73 78  
74 79 #
75 80 # Loadable module support
76 81  
... ... @@ -111,14 +116,12 @@
111 116 # CONFIG_PPC_PMAC is not set
112 117 CONFIG_PPC_MAPLE=y
113 118 # CONFIG_PPC_CELL is not set
114   -CONFIG_PPC_OF=y
115 119 CONFIG_U3_DART=y
116 120 CONFIG_MPIC=y
117 121 # CONFIG_PPC_RTAS is not set
118 122 # CONFIG_MMIO_NVRAM is not set
119 123 CONFIG_MPIC_BROKEN_U3=y
120 124 # CONFIG_PPC_MPC106 is not set
121   -CONFIG_GENERIC_TBSYNC=y
122 125 # CONFIG_CPU_FREQ is not set
123 126 # CONFIG_WANT_EARLY_SERIAL is not set
124 127  
... ... @@ -138,6 +141,7 @@
138 141 CONFIG_FORCE_MAX_ZONEORDER=13
139 142 CONFIG_IOMMU_VMERGE=y
140 143 CONFIG_KEXEC=y
  144 +# CONFIG_CRASH_DUMP is not set
141 145 CONFIG_IRQ_ALL_CPUS=y
142 146 # CONFIG_NUMA is not set
143 147 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
... ... @@ -189,6 +193,7 @@
189 193 #
190 194 # Networking options
191 195 #
  196 +# CONFIG_NETDEBUG is not set
192 197 CONFIG_PACKET=y
193 198 CONFIG_PACKET_MMAP=y
194 199 CONFIG_UNIX=y
... ... @@ -226,6 +231,11 @@
226 231 # SCTP Configuration (EXPERIMENTAL)
227 232 #
228 233 # CONFIG_IP_SCTP is not set
  234 +
  235 +#
  236 +# TIPC Configuration (EXPERIMENTAL)
  237 +#
  238 +# CONFIG_TIPC is not set
229 239 # CONFIG_ATM is not set
230 240 # CONFIG_BRIDGE is not set
231 241 # CONFIG_VLAN_8021Q is not set
... ... @@ -461,6 +471,7 @@
461 471 # CONFIG_R8169 is not set
462 472 # CONFIG_SIS190 is not set
463 473 # CONFIG_SKGE is not set
  474 +# CONFIG_SKY2 is not set
464 475 # CONFIG_SK98LIN is not set
465 476 # CONFIG_VIA_VELOCITY is not set
466 477 # CONFIG_TIGON3 is not set
... ... @@ -553,6 +564,7 @@
553 564 CONFIG_SERIAL_8250=y
554 565 CONFIG_SERIAL_8250_CONSOLE=y
555 566 CONFIG_SERIAL_8250_NR_UARTS=4
  567 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4
556 568 # CONFIG_SERIAL_8250_EXTENDED is not set
557 569  
558 570 #
... ... @@ -651,6 +663,12 @@
651 663 # CONFIG_I2C_DEBUG_CHIP is not set
652 664  
653 665 #
  666 +# SPI support
  667 +#
  668 +# CONFIG_SPI is not set
  669 +# CONFIG_SPI_MASTER is not set
  670 +
  671 +#
654 672 # Dallas's 1-wire bus
655 673 #
656 674 # CONFIG_W1 is not set
657 675  
... ... @@ -738,12 +756,14 @@
738 756 # may also be needed; see USB_STORAGE Help for more information
739 757 #
740 758 # CONFIG_USB_STORAGE is not set
  759 +# CONFIG_USB_LIBUSUAL is not set
741 760  
742 761 #
743 762 # USB Input Devices
744 763 #
745 764 CONFIG_USB_HID=y
746 765 CONFIG_USB_HIDINPUT=y
  766 +# CONFIG_USB_HIDINPUT_POWERBOOK is not set
747 767 # CONFIG_HID_FF is not set
748 768 # CONFIG_USB_HIDDEV is not set
749 769 # CONFIG_USB_AIPTEK is not set
... ... @@ -757,6 +777,7 @@
757 777 # CONFIG_USB_YEALINK is not set
758 778 # CONFIG_USB_XPAD is not set
759 779 # CONFIG_USB_ATI_REMOTE is not set
  780 +# CONFIG_USB_ATI_REMOTE2 is not set
760 781 # CONFIG_USB_KEYSPAN_REMOTE is not set
761 782 # CONFIG_USB_APPLETOUCH is not set
762 783  
... ... @@ -797,6 +818,7 @@
797 818 # CONFIG_USB_SERIAL_AIRPRIME is not set
798 819 # CONFIG_USB_SERIAL_ANYDATA is not set
799 820 # CONFIG_USB_SERIAL_BELKIN is not set
  821 +# CONFIG_USB_SERIAL_WHITEHEAT is not set
800 822 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
801 823 # CONFIG_USB_SERIAL_CP2101 is not set
802 824 CONFIG_USB_SERIAL_CYPRESS_M8=m
... ... @@ -873,7 +895,7 @@
873 895 # CONFIG_INFINIBAND is not set
874 896  
875 897 #
876   -# SN Devices
  898 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
877 899 #
878 900  
879 901 #
... ... @@ -891,6 +913,7 @@
891 913 # CONFIG_JFS_FS is not set
892 914 CONFIG_FS_POSIX_ACL=y
893 915 # CONFIG_XFS_FS is not set
  916 +# CONFIG_OCFS2_FS is not set
894 917 # CONFIG_MINIX_FS is not set
895 918 # CONFIG_ROMFS_FS is not set
896 919 CONFIG_INOTIFY=y
... ... @@ -927,6 +950,7 @@
927 950 CONFIG_HUGETLB_PAGE=y
928 951 CONFIG_RAMFS=y
929 952 # CONFIG_RELAYFS_FS is not set
  953 +# CONFIG_CONFIGFS_FS is not set
930 954  
931 955 #
932 956 # Miscellaneous filesystems
... ... @@ -988,6 +1012,7 @@
988 1012 # CONFIG_SGI_PARTITION is not set
989 1013 # CONFIG_ULTRIX_PARTITION is not set
990 1014 # CONFIG_SUN_PARTITION is not set
  1015 +# CONFIG_KARMA_PARTITION is not set
991 1016 # CONFIG_EFI_PARTITION is not set
992 1017  
993 1018 #
994 1019  
995 1020  
996 1021  
... ... @@ -1053,18 +1078,20 @@
1053 1078 # Kernel hacking
1054 1079 #
1055 1080 # CONFIG_PRINTK_TIME is not set
1056   -CONFIG_DEBUG_KERNEL=y
1057 1081 CONFIG_MAGIC_SYSRQ=y
  1082 +CONFIG_DEBUG_KERNEL=y
1058 1083 CONFIG_LOG_BUF_SHIFT=17
1059 1084 CONFIG_DETECT_SOFTLOCKUP=y
1060 1085 # CONFIG_SCHEDSTATS is not set
1061 1086 CONFIG_DEBUG_SLAB=y
  1087 +# CONFIG_DEBUG_MUTEXES is not set
1062 1088 # CONFIG_DEBUG_SPINLOCK is not set
1063 1089 CONFIG_DEBUG_SPINLOCK_SLEEP=y
1064 1090 # CONFIG_DEBUG_KOBJECT is not set
1065 1091 # CONFIG_DEBUG_INFO is not set
1066 1092 CONFIG_DEBUG_FS=y
1067 1093 # CONFIG_DEBUG_VM is not set
  1094 +# CONFIG_FORCED_INLINING is not set
1068 1095 # CONFIG_RCU_TORTURE_TEST is not set
1069 1096 CONFIG_DEBUG_STACKOVERFLOW=y
1070 1097 CONFIG_DEBUG_STACK_USAGE=y
... ... @@ -1073,6 +1100,11 @@
1073 1100 CONFIG_XMON_DEFAULT=y
1074 1101 # CONFIG_IRQSTACKS is not set
1075 1102 CONFIG_BOOTX_TEXT=y
  1103 +# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
  1104 +# CONFIG_PPC_EARLY_DEBUG_G5 is not set
  1105 +# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
  1106 +# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
  1107 +# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1076 1108  
1077 1109 #
1078 1110 # Security options
arch/powerpc/configs/mpc834x_sys_defconfig
Diff comments   View file @ 485ff09
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,7 +43,6 @@
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  
... ... @@ -189,6 +188,7 @@
189 188 #
190 189 # Networking options
191 190 #
  191 +# CONFIG_NETDEBUG is not set
192 192 CONFIG_PACKET=y
193 193 # CONFIG_PACKET_MMAP is not set
194 194 CONFIG_UNIX=y
... ... @@ -226,6 +226,11 @@
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
... ... @@ -511,6 +516,7 @@
511 516 #
512 517 CONFIG_SERIAL_CORE=y
513 518 CONFIG_SERIAL_CORE_CONSOLE=y
  519 +# CONFIG_SERIAL_JSM is not set
514 520 CONFIG_UNIX98_PTYS=y
515 521 CONFIG_LEGACY_PTYS=y
516 522 CONFIG_LEGACY_PTY_COUNT=256
... ... @@ -615,6 +621,12 @@
615 621 # CONFIG_I2C_DEBUG_CHIP is not set
616 622  
617 623 #
  624 +# SPI support
  625 +#
  626 +# CONFIG_SPI is not set
  627 +# CONFIG_SPI_MASTER is not set
  628 +
  629 +#
618 630 # Dallas's 1-wire bus
619 631 #
620 632 # CONFIG_W1 is not set
... ... @@ -632,6 +644,7 @@
632 644 # CONFIG_SENSORS_ASB100 is not set
633 645 # CONFIG_SENSORS_ATXP1 is not set
634 646 # CONFIG_SENSORS_DS1621 is not set
  647 +# CONFIG_SENSORS_F71805F is not set
635 648 # CONFIG_SENSORS_FSCHER is not set
636 649 # CONFIG_SENSORS_FSCPOS is not set
637 650 # CONFIG_SENSORS_GL518SM is not set
... ... @@ -716,7 +729,7 @@
716 729 # CONFIG_INFINIBAND is not set
717 730  
718 731 #
719   -# SN Devices
  732 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
720 733 #
721 734  
722 735 #
... ... @@ -826,6 +839,7 @@
826 839 # CONFIG_SGI_PARTITION is not set
827 840 # CONFIG_ULTRIX_PARTITION is not set
828 841 # CONFIG_SUN_PARTITION is not set
  842 +# CONFIG_KARMA_PARTITION is not set
829 843 # CONFIG_EFI_PARTITION is not set
830 844  
831 845 #
... ... @@ -899,14 +913,4 @@
899 913 #
900 914 # Hardware crypto devices
901 915 #
902   -
903   -#
904   -# SEC2.x Options
905   -#
906   -CONFIG_MPC8349E_SEC2x=y
907   -
908   -#
909   -# SEC2.x Test Options
910   -#
911   -CONFIG_MPC8349E_SEC2xTEST=y
arch/powerpc/configs/pmac32_defconfig
Diff comments   View file @ 485ff09
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
8 8  
... ... @@ -17,8 +17,8 @@
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,7 +43,6 @@
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  
... ... @@ -236,6 +235,7 @@
236 235 #
237 236 # Networking options
238 237 #
  238 +# CONFIG_NETDEBUG is not set
239 239 CONFIG_PACKET=y
240 240 # CONFIG_PACKET_MMAP is not set
241 241 CONFIG_UNIX=y
... ... @@ -271,6 +271,25 @@
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
277 296  
278 297  
279 298  
280 299  
281 300  
282 301  
... ... @@ -288,37 +307,22 @@
288 307 CONFIG_IP_NF_PPTP=m
289 308 # CONFIG_IP_NF_QUEUE is not set
290 309 CONFIG_IP_NF_IPTABLES=m
291   -CONFIG_IP_NF_MATCH_LIMIT=m
292 310 CONFIG_IP_NF_MATCH_IPRANGE=m
293   -CONFIG_IP_NF_MATCH_MAC=m
294   -CONFIG_IP_NF_MATCH_PKTTYPE=m
295   -CONFIG_IP_NF_MATCH_MARK=m
296 311 CONFIG_IP_NF_MATCH_MULTIPORT=m
297 312 CONFIG_IP_NF_MATCH_TOS=m
298 313 CONFIG_IP_NF_MATCH_RECENT=m
299 314 CONFIG_IP_NF_MATCH_ECN=m
300 315 CONFIG_IP_NF_MATCH_DSCP=m
301 316 CONFIG_IP_NF_MATCH_AH_ESP=m
302   -CONFIG_IP_NF_MATCH_LENGTH=m
303 317 CONFIG_IP_NF_MATCH_TTL=m
304   -CONFIG_IP_NF_MATCH_TCPMSS=m
305   -CONFIG_IP_NF_MATCH_HELPER=m
306   -CONFIG_IP_NF_MATCH_STATE=m
307   -CONFIG_IP_NF_MATCH_CONNTRACK=m
308 318 CONFIG_IP_NF_MATCH_OWNER=m
309   -# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
310   -# CONFIG_IP_NF_MATCH_REALM is not set
311   -# CONFIG_IP_NF_MATCH_SCTP is not set
312   -CONFIG_IP_NF_MATCH_DCCP=m
313   -# CONFIG_IP_NF_MATCH_COMMENT is not set
314   -# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
315   -CONFIG_IP_NF_MATCH_STRING=m
  319 +CONFIG_IP_NF_MATCH_ADDRTYPE=m
  320 +CONFIG_IP_NF_MATCH_HASHLIMIT=m
316 321 CONFIG_IP_NF_FILTER=m
317 322 CONFIG_IP_NF_TARGET_REJECT=m
318   -# CONFIG_IP_NF_TARGET_LOG is not set
  323 +CONFIG_IP_NF_TARGET_LOG=m
319 324 CONFIG_IP_NF_TARGET_ULOG=m
320 325 CONFIG_IP_NF_TARGET_TCPMSS=m
321   -# CONFIG_IP_NF_TARGET_NFQUEUE is not set
322 326 CONFIG_IP_NF_NAT=m
323 327 CONFIG_IP_NF_NAT_NEEDED=y
324 328 CONFIG_IP_NF_TARGET_MASQUERADE=m
325 329  
... ... @@ -331,9 +335,12 @@
331 335 CONFIG_IP_NF_NAT_TFTP=m
332 336 CONFIG_IP_NF_NAT_AMANDA=m
333 337 CONFIG_IP_NF_NAT_PPTP=m
334   -# CONFIG_IP_NF_MANGLE is not set
  338 +CONFIG_IP_NF_MANGLE=m
  339 +CONFIG_IP_NF_TARGET_TOS=m
  340 +CONFIG_IP_NF_TARGET_ECN=m
  341 +CONFIG_IP_NF_TARGET_DSCP=m
  342 +CONFIG_IP_NF_TARGET_TTL=m
335 343 CONFIG_IP_NF_RAW=m
336   -CONFIG_IP_NF_TARGET_NOTRACK=m
337 344 CONFIG_IP_NF_ARPTABLES=m
338 345 CONFIG_IP_NF_ARPFILTER=m
339 346 CONFIG_IP_NF_ARP_MANGLE=m
... ... @@ -360,6 +367,11 @@
360 367 # SCTP Configuration (EXPERIMENTAL)
361 368 #
362 369 # CONFIG_IP_SCTP is not set
  370 +
  371 +#
  372 +# TIPC Configuration (EXPERIMENTAL)
  373 +#
  374 +# CONFIG_TIPC is not set
363 375 # CONFIG_ATM is not set
364 376 # CONFIG_BRIDGE is not set
365 377 # CONFIG_VLAN_8021Q is not set
... ... @@ -377,6 +389,7 @@
377 389 # QoS and/or fair queueing
378 390 #
379 391 # CONFIG_NET_SCHED is not set
  392 +CONFIG_NET_CLS_ROUTE=y
380 393  
381 394 #
382 395 # Network testing
... ... @@ -568,7 +581,6 @@
568 581 # CONFIG_BLK_DEV_NS87415 is not set
569 582 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
570 583 CONFIG_BLK_DEV_PDC202XX_NEW=y
571   -# CONFIG_PDC202XX_FORCE is not set
572 584 # CONFIG_BLK_DEV_SVWKS is not set
573 585 # CONFIG_BLK_DEV_SIIMAGE is not set
574 586 # CONFIG_BLK_DEV_SLC90E66 is not set
... ... @@ -654,8 +666,7 @@
654 666 # CONFIG_SCSI_IPR is not set
655 667 # CONFIG_SCSI_QLOGIC_FC is not set
656 668 # CONFIG_SCSI_QLOGIC_1280 is not set
657   -CONFIG_SCSI_QLA2XXX=y
658   -# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
  669 +# CONFIG_SCSI_QLA_FC is not set
659 670 # CONFIG_SCSI_LPFC is not set
660 671 # CONFIG_SCSI_DC395x is not set
661 672 # CONFIG_SCSI_DC390T is not set
... ... @@ -991,6 +1002,7 @@
991 1002 #
992 1003 CONFIG_SERIAL_CORE=m
993 1004 CONFIG_SERIAL_PMACZILOG=m
  1005 +# CONFIG_SERIAL_JSM is not set
994 1006 CONFIG_UNIX98_PTYS=y
995 1007 CONFIG_LEGACY_PTYS=y
996 1008 CONFIG_LEGACY_PTY_COUNT=256
... ... @@ -1098,6 +1110,12 @@
1098 1110 # CONFIG_I2C_DEBUG_CHIP is not set
1099 1111  
1100 1112 #
  1113 +# SPI support
  1114 +#
  1115 +# CONFIG_SPI is not set
  1116 +# CONFIG_SPI_MASTER is not set
  1117 +
  1118 +#
1101 1119 # Dallas's 1-wire bus
1102 1120 #
1103 1121 # CONFIG_W1 is not set
... ... @@ -1348,6 +1366,7 @@
1348 1366 #
1349 1367 CONFIG_USB_HID=y
1350 1368 CONFIG_USB_HIDINPUT=y
  1369 +CONFIG_USB_HIDINPUT_POWERBOOK=y
1351 1370 # CONFIG_HID_FF is not set
1352 1371 # CONFIG_USB_HIDDEV is not set
1353 1372 # CONFIG_USB_AIPTEK is not set
... ... @@ -1488,7 +1507,7 @@
1488 1507 # CONFIG_INFINIBAND is not set
1489 1508  
1490 1509 #
1491   -# SN Devices
  1510 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1492 1511 #
1493 1512  
1494 1513 #
... ... @@ -1609,6 +1628,7 @@
1609 1628 # CONFIG_SGI_PARTITION is not set
1610 1629 # CONFIG_ULTRIX_PARTITION is not set
1611 1630 # CONFIG_SUN_PARTITION is not set
  1631 +# CONFIG_KARMA_PARTITION is not set
1612 1632 # CONFIG_EFI_PARTITION is not set
1613 1633  
1614 1634 #
... ... @@ -1692,6 +1712,7 @@
1692 1712 # CONFIG_DEBUG_INFO is not set
1693 1713 # CONFIG_DEBUG_FS is not set
1694 1714 # CONFIG_DEBUG_VM is not set
  1715 +# CONFIG_FORCED_INLINING is not set
1695 1716 # CONFIG_RCU_TORTURE_TEST is not set
1696 1717 CONFIG_DEBUGGER=y
1697 1718 CONFIG_XMON=y
arch/powerpc/configs/ppc64_defconfig
Diff comments   View file @ 485ff09
... ... @@ -407,7 +407,7 @@
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
arch/powerpc/kernel/pci_64.c
Diff comments   View file @ 485ff09
... ... @@ -589,7 +589,6 @@
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)
596 595  
... ... @@ -608,8 +607,10 @@
608 607 printk("PCI: Probing PCI hardware\n");
609 608  
610 609 /* Scan all of the recorded PCI controllers. */
611   - list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
  610 + list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
612 611 scan_phb(hose);
  612 + pci_bus_add_devices(hose->bus);
  613 + }
613 614  
614 615 #ifndef CONFIG_PPC_ISERIES
615 616 if (pci_probe_only)
arch/powerpc/kernel/ppc_ksyms.c
Diff comments   View file @ 485ff09
... ... @@ -110,15 +110,6 @@
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);
... ... @@ -161,7 +152,6 @@
161 152 EXPORT_SYMBOL(flush_dcache_range);
162 153  
163 154 #ifdef CONFIG_SMP
164   -EXPORT_SYMBOL(smp_call_function);
165 155 #ifdef CONFIG_PPC32
166 156 EXPORT_SYMBOL(smp_hw_index);
167 157 #endif
arch/powerpc/kernel/rtas-rtc.c
Diff comments   View file @ 485ff09
... ... @@ -52,7 +52,7 @@
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 */
arch/powerpc/kernel/rtas_pci.c
Diff comments   View file @ 485ff09
... ... @@ -280,8 +280,7 @@
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);
... ... @@ -358,27 +357,6 @@
358 357  
359 358 return 0;
360 359 }
361   -
362   -struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
363   -{
364   - struct pci_controller *phb;
365   - int primary;
366   -
367   - primary = list_empty(&hose_list);
368   - phb = pcibios_alloc_controller(dn);
369   - if (!phb)
370   - return NULL;
371   - setup_phb(dn, phb);
372   - pci_process_bridge_OF_ranges(phb, dn, primary);
373   -
374   - pci_setup_phb_io_dynamic(phb, primary);
375   -
376   - pci_devs_phb_init_dynamic(phb);
377   - scan_phb(phb);
378   -
379   - return phb;
380   -}
381   -EXPORT_SYMBOL(init_phb_dynamic);
382 360  
383 361 /* RPA-specific bits for removing PHBs */
384 362 int pcibios_remove_root_bus(struct pci_controller *phb)
arch/powerpc/kernel/time.c
Diff comments   View file @ 485ff09
... ... @@ -283,9 +283,9 @@
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;
292 292  
... ... @@ -310,20 +310,15 @@
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;
... ... @@ -332,6 +327,21 @@
332 327 new_stamp_xsec = (u64) xtime.tv_nsec * XSEC_PER_SEC;
333 328 do_div(new_stamp_xsec, 1000000000);
334 329 new_stamp_xsec += (u64) xtime.tv_sec * XSEC_PER_SEC;
  330 +
  331 + ++vdso_data->tb_update_count;
  332 + smp_mb();
  333 +
  334 + /*
  335 + * Make sure time doesn't go backwards for userspace gettimeofday.
  336 + */
  337 + tb = get_tb();
  338 + varp = do_gtod.varp;
  339 + xsec_old = mulhdu(tb - varp->tb_orig_stamp, varp->tb_to_xs)
  340 + + varp->stamp_xsec;
  341 + xsec_new = mulhdu(tb - cur_tb, t2x) + new_stamp_xsec;
  342 + if (xsec_new < xsec_old)
  343 + new_stamp_xsec += xsec_old - xsec_new;
  344 +
335 345 update_gtod(cur_tb, new_stamp_xsec, t2x);
336 346 }
337 347  
... ... @@ -564,6 +574,10 @@
564 574 }
565 575 #endif
566 576  
  577 + /* Make userspace gettimeofday spin until we're done. */
  578 + ++vdso_data->tb_update_count;
  579 + smp_mb();
  580 +
567 581 /*
568 582 * Subtract off the number of nanoseconds since the
569 583 * beginning of the last tick.
570 584  
... ... @@ -724,10 +738,16 @@
724 738 * It is computed as:
725 739 * ticklen_to_xs = 2^N / (tb_ticks_per_jiffy * 1e9)
726 740 * where N = 64 + 20 - TICKLEN_SCALE - TICKLEN_SHIFT
727   - * so as to give the result as a 0.64 fixed-point fraction.
  741 + * which turns out to be N = 51 - SHIFT_HZ.
  742 + * This gives the result as a 0.64 fixed-point fraction.
  743 + * That value is reduced by an offset amounting to 1 xsec per
  744 + * 2^31 timebase ticks to avoid problems with time going backwards
  745 + * by 1 xsec when we do timer_recalc_offset due to losing the
  746 + * fractional xsec. That offset is equal to ppc_tb_freq/2^51
  747 + * since there are 2^20 xsec in a second.
728 748 */
729   - div128_by_32(1ULL << (64 + 20 - TICKLEN_SCALE - TICKLEN_SHIFT), 0,
730   - tb_ticks_per_jiffy, &res);
  749 + div128_by_32((1ULL << 51) - ppc_tb_freq, 0,
  750 + tb_ticks_per_jiffy << SHIFT_HZ, &res);
731 751 div128_by_32(res.result_high, res.result_low, NSEC_PER_SEC, &res);
732 752 ticklen_to_xs = res.result_low;
733 753  
arch/powerpc/mm/pgtable_32.c
Diff comments   View file @ 485ff09
... ... @@ -37,6 +37,7 @@
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)
... ... @@ -153,6 +154,7 @@
153 154 {
154 155 return __ioremap(addr, size, _PAGE_NO_CACHE);
155 156 }
  157 +EXPORT_SYMBOL(ioremap64);
156 158  
157 159 void __iomem *
158 160 ioremap(phys_addr_t addr, unsigned long size)
... ... @@ -162,6 +164,7 @@
162 164 return ioremap64(addr64, size);
163 165 }
164 166 #endif /* CONFIG_PHYS_64BIT */
  167 +EXPORT_SYMBOL(ioremap);
165 168  
166 169 void __iomem *
167 170 __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
... ... @@ -247,6 +250,7 @@
247 250 out:
248 251 return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK));
249 252 }
  253 +EXPORT_SYMBOL(__ioremap);
250 254  
251 255 void iounmap(volatile void __iomem *addr)
252 256 {
... ... @@ -259,6 +263,7 @@
259 263 if (addr > high_memory && (unsigned long) addr < ioremap_bot)
260 264 vunmap((void *) (PAGE_MASK & (unsigned long)addr));
261 265 }
  266 +EXPORT_SYMBOL(iounmap);
262 267  
263 268 void __iomem *ioport_map(unsigned long port, unsigned int len)
264 269 {
arch/powerpc/platforms/powermac/feature.c
Diff comments   View file @ 485ff09
... ... @@ -2491,9 +2491,7 @@
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
2500 2498  
... ... @@ -2522,10 +2520,11 @@
2522 2520 * NAP mode
2523 2521 */
2524 2522 powersave_lowspeed = 1;
2525   -#endif /* CONFIG_6xx */
2526   -#ifdef CONFIG_POWER4
  2523 +
  2524 +#else /* CONFIG_POWER4 */
2527 2525 powersave_nap = 1;
2528   -#endif
  2526 +#endif /* CONFIG_POWER4 */
  2527 +
2529 2528 /* Check for "mobile" machine */
2530 2529 if (model && (strncmp(model, "PowerBook", 9) == 0
2531 2530 || strncmp(model, "iBook", 5) == 0))
arch/powerpc/platforms/powermac/setup.c
Diff comments   View file @ 485ff09
... ... @@ -621,10 +621,6 @@
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"));
arch/powerpc/platforms/pseries/Kconfig
Diff comments   View file @ 485ff09
... ... @@ -19,7 +19,7 @@
19 19 depends on RTAS_PROC && PPC_PSERIES
20 20  
21 21 config LPARCFG
22   - tristate "LPAR Configuration Data"
  22 + bool "LPAR Configuration Data"
23 23 depends on PPC_PSERIES || PPC_ISERIES
24 24 help
25 25 Provide system capacity information via human readable
arch/powerpc/platforms/pseries/pci_dlpar.c
Diff comments   View file @ 485ff09
... ... @@ -27,6 +27,7 @@
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,
... ... @@ -179,4 +180,31 @@
179 180 }
180 181 }
181 182 EXPORT_SYMBOL_GPL(pcibios_add_pci_devices);
  183 +
  184 +struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
  185 +{
  186 + struct pci_controller *phb;
  187 + int primary;
  188 +
  189 + primary = list_empty(&hose_list);
  190 + phb = pcibios_alloc_controller(dn);
  191 + if (!phb)
  192 + return NULL;
  193 + setup_phb(dn, phb);
  194 + pci_process_bridge_OF_ranges(phb, dn, 0);
  195 +
  196 + pci_setup_phb_io_dynamic(phb, primary);
  197 +
  198 + pci_devs_phb_init_dynamic(phb);
  199 +
  200 + if (dn->child)
  201 + eeh_add_device_tree_early(dn);
  202 +
  203 + scan_phb(phb);
  204 + pcibios_fixup_new_pci_devices(phb->bus, 0);
  205 + pci_bus_add_devices(phb->bus);
  206 +
  207 + return phb;
  208 +}
  209 +EXPORT_SYMBOL_GPL(init_phb_dynamic);
include/asm-powerpc/ppc-pci.h
Diff comments   View file @ 485ff09
... ... @@ -38,6 +38,7 @@
38 38  
39 39 void pci_devs_phb_init(void);
40 40 void pci_devs_phb_init_dynamic(struct pci_controller *phb);
  41 +int setup_phb(struct device_node *dev, struct pci_controller *phb);
41 42 void __devinit scan_phb(struct pci_controller *hose);
42 43  
43 44 /* From rtas_pci.h */