Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adb9c9ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

parents a80614d1 fb5c594c

arch/powerpc/configs/g5_defconfig

+71 −103
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.15-rc5

# Tue Dec 20 15:59:30 2005

# Linux kernel version: 2.6.16-rc2

# Fri Feb 10 17:33:08 2006

#

CONFIG_PPC64=y

CONFIG_64BIT=y
@@ -16,6 +16,10 @@ CONFIG_COMPAT=y 
CONFIG_SYSVIPC_COMPAT=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

CONFIG_PPC_OF=y

# CONFIG_PPC_UDBG_16550 is not set

CONFIG_GENERIC_TBSYNC=y

# CONFIG_DEFAULT_UIMAGE is not set



#

# Processor support
@@ -26,13 +30,12 @@ CONFIG_PPC_FPU=y 
CONFIG_ALTIVEC=y

CONFIG_PPC_STD_MMU=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_NR_CPUS=4



#

# Code maturity level options

#

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -47,8 +50,6 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set
@@ -58,8 +59,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y
@@ -68,8 +71,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 
CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support
@@ -112,13 +117,12 @@ CONFIG_PPC_PMAC=y 
CONFIG_PPC_PMAC64=y

# CONFIG_PPC_MAPLE is not set

# CONFIG_PPC_CELL is not set

CONFIG_PPC_OF=y

CONFIG_U3_DART=y

CONFIG_MPIC=y

# CONFIG_PPC_RTAS is not set

# CONFIG_MMIO_NVRAM is not set

CONFIG_MPIC_BROKEN_U3=y

# CONFIG_PPC_MPC106 is not set

CONFIG_GENERIC_TBSYNC=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=y

# CONFIG_CPU_FREQ_DEBUG is not set
@@ -151,6 +155,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 
CONFIG_IOMMU_VMERGE=y

# CONFIG_HOTPLUG_CPU is not set

CONFIG_KEXEC=y

# CONFIG_CRASH_DUMP is not set

CONFIG_IRQ_ALL_CPUS=y

# CONFIG_NUMA is not set

CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -202,6 +207,7 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y
@@ -239,6 +245,7 @@ CONFIG_NETFILTER=y 
# Core Netfilter Configuration

#

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_NETFILTER_XTABLES is not set



#

# IP: Netfilter Configuration
@@ -255,65 +262,6 @@ CONFIG_IP_NF_TFTP=m 
CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_LIMIT=m

CONFIG_IP_NF_MATCH_IPRANGE=m

CONFIG_IP_NF_MATCH_MAC=m

CONFIG_IP_NF_MATCH_PKTTYPE=m

CONFIG_IP_NF_MATCH_MARK=m

CONFIG_IP_NF_MATCH_MULTIPORT=m

CONFIG_IP_NF_MATCH_TOS=m

CONFIG_IP_NF_MATCH_RECENT=m

CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_DSCP=m

CONFIG_IP_NF_MATCH_AH_ESP=m

CONFIG_IP_NF_MATCH_LENGTH=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_MATCH_TCPMSS=m

CONFIG_IP_NF_MATCH_HELPER=m

CONFIG_IP_NF_MATCH_STATE=m

CONFIG_IP_NF_MATCH_CONNTRACK=m

CONFIG_IP_NF_MATCH_OWNER=m

CONFIG_IP_NF_MATCH_ADDRTYPE=m

CONFIG_IP_NF_MATCH_REALM=m

CONFIG_IP_NF_MATCH_SCTP=m

# CONFIG_IP_NF_MATCH_DCCP is not set

CONFIG_IP_NF_MATCH_COMMENT=m

CONFIG_IP_NF_MATCH_CONNMARK=m

CONFIG_IP_NF_MATCH_CONNBYTES=m

CONFIG_IP_NF_MATCH_HASHLIMIT=m

CONFIG_IP_NF_MATCH_STRING=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_LOG=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_IP_NF_TARGET_TCPMSS=m

CONFIG_IP_NF_TARGET_NFQUEUE=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_NAT_NEEDED=y

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_SAME=m

CONFIG_IP_NF_NAT_SNMP_BASIC=m

CONFIG_IP_NF_NAT_IRC=m

CONFIG_IP_NF_NAT_FTP=m

CONFIG_IP_NF_NAT_TFTP=m

CONFIG_IP_NF_NAT_AMANDA=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_TOS=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_DSCP=m

CONFIG_IP_NF_TARGET_MARK=m

CONFIG_IP_NF_TARGET_CLASSIFY=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_TARGET_CONNMARK=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_TARGET_NOTRACK=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m



#

# DCCP Configuration (EXPERIMENTAL)
@@ -324,6 +272,11 @@ CONFIG_IP_NF_ARP_MANGLE=m 
# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set



#

# TIPC Configuration (EXPERIMENTAL)

#

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set
@@ -342,7 +295,6 @@ CONFIG_LLC=y 
# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

CONFIG_NET_CLS_ROUTE=y



#

# Network testing
@@ -545,13 +497,7 @@ CONFIG_SCSI_SATA_SVW=y 
# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_FC is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

CONFIG_SCSI_QLA2XXX=y

# CONFIG_SCSI_QLA21XX is not set

# CONFIG_SCSI_QLA22XX is not set

# CONFIG_SCSI_QLA2300 is not set

# CONFIG_SCSI_QLA2322 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_QLA24XX is not set

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -614,7 +560,6 @@ CONFIG_IEEE1394_SBP2=m 
CONFIG_IEEE1394_ETH1394=m

CONFIG_IEEE1394_DV1394=m

CONFIG_IEEE1394_RAWIO=y

# CONFIG_IEEE1394_CMP is not set



#

# I2O device support
@@ -630,6 +575,7 @@ CONFIG_THERM_PM72=y 
CONFIG_WINDFARM=y

CONFIG_WINDFARM_PM81=y

CONFIG_WINDFARM_PM91=y

CONFIG_WINDFARM_PM112=y



#

# Network device support
@@ -682,8 +628,9 @@ CONFIG_E1000=y 
# CONFIG_R8169 is not set

# CONFIG_SIS190 is not set

# CONFIG_SKGE is not set

# CONFIG_SKY2 is not set

# CONFIG_SK98LIN is not set

CONFIG_TIGON3=m

CONFIG_TIGON3=y

# CONFIG_BNX2 is not set

# CONFIG_MV643XX_ETH is not set
@@ -861,8 +808,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_I801 is not set

# CONFIG_I2C_I810 is not set

# CONFIG_I2C_PIIX4 is not set

CONFIG_I2C_KEYWEST=y

CONFIG_I2C_PMAC_SMU=y

CONFIG_I2C_POWERMAC=y

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set
@@ -894,6 +840,12 @@ CONFIG_I2C_PMAC_SMU=y 
# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set



#

# SPI support

#

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set



#

# Dallas's 1-wire bus

#
@@ -961,7 +913,6 @@ CONFIG_FB_RADEON_I2C=y 
# CONFIG_FB_KYRO is not set

# CONFIG_FB_3DFX is not set

# CONFIG_FB_VOODOO1 is not set

# CONFIG_FB_CYBLA is not set

# CONFIG_FB_TRIDENT is not set

# CONFIG_FB_VIRTUAL is not set
@@ -1008,9 +959,10 @@ CONFIG_SND_OSSEMUL=y 
CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

CONFIG_SND_GENERIC_DRIVER=y



#

# Generic devices
@@ -1024,6 +976,8 @@ CONFIG_SND_GENERIC_DRIVER=y 
#

# PCI devices

#

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALS4000 is not set

# CONFIG_SND_ALI5451 is not set

# CONFIG_SND_ATIIXP is not set

# CONFIG_SND_ATIIXP_MODEM is not set
@@ -1032,39 +986,38 @@ CONFIG_SND_GENERIC_DRIVER=y 
# CONFIG_SND_AU8830 is not set

# CONFIG_SND_AZT3328 is not set

# CONFIG_SND_BT87X is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_EMU10K1 is not set

# CONFIG_SND_EMU10K1X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_YMFPCI is not set

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALS4000 is not set

# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_ENS1370 is not set

# CONFIG_SND_ENS1371 is not set

# CONFIG_SND_ES1938 is not set

# CONFIG_SND_ES1968 is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_FM801 is not set

# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_ICE1712 is not set

# CONFIG_SND_ICE1724 is not set

# CONFIG_SND_INTEL8X0 is not set

# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_PCXHR is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_SONICVIBES is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_YMFPCI is not set



#

# ALSA PowerMac devices
@@ -1136,13 +1089,16 @@ CONFIG_USB_STORAGE_DPCM=y 
CONFIG_USB_STORAGE_SDDR09=y

CONFIG_USB_STORAGE_SDDR55=y

CONFIG_USB_STORAGE_JUMPSHOT=y

# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set

# CONFIG_USB_LIBUSUAL is not set



#

# USB Input Devices

#

CONFIG_USB_HID=y

CONFIG_USB_HIDINPUT=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

CONFIG_HID_FF=y

CONFIG_HID_PID=y

CONFIG_LOGITECH_FF=y
@@ -1159,6 +1115,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_YEALINK is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set

# CONFIG_USB_ATI_REMOTE2 is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set
@@ -1207,6 +1164,7 @@ CONFIG_USB_SERIAL_GENERIC=y 
# CONFIG_USB_SERIAL_AIRPRIME is not set

# CONFIG_USB_SERIAL_ANYDATA is not set

CONFIG_USB_SERIAL_BELKIN=m

# CONFIG_USB_SERIAL_WHITEHEAT is not set

CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m

# CONFIG_USB_SERIAL_CP2101 is not set

CONFIG_USB_SERIAL_CYPRESS_M8=m
@@ -1287,6 +1245,10 @@ CONFIG_USB_EZUSB=y 
# SN Devices

#



#

# EDAC - error detection and reporting (RAS)

#



#

# File systems

#
@@ -1317,6 +1279,7 @@ CONFIG_XFS_EXPORT=y 
CONFIG_XFS_SECURITY=y

CONFIG_XFS_POSIX_ACL=y

# CONFIG_XFS_RT is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y
@@ -1357,6 +1320,7 @@ CONFIG_HUGETLBFS=y 
CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems
@@ -1426,6 +1390,7 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_SGI_PARTITION is not set

# CONFIG_ULTRIX_PARTITION is not set

# CONFIG_SUN_PARTITION is not set

# CONFIG_KARMA_PARTITION is not set

# CONFIG_EFI_PARTITION is not set



#
@@ -1481,10 +1446,6 @@ CONFIG_CRC32=y 
CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=m

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m



#

# Instrumentation Support
@@ -1497,24 +1458,31 @@ CONFIG_OPROFILE=y 
# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=17

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_VM is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_DEBUG_STACKOVERFLOW is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUGGER is not set

CONFIG_IRQSTACKS=y

CONFIG_BOOTX_TEXT=y

# CONFIG_PPC_EARLY_DEBUG_LPAR is not set

# CONFIG_PPC_EARLY_DEBUG_G5 is not set

# CONFIG_PPC_EARLY_DEBUG_RTAS is not set

# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set

# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set



#

# Security options

arch/powerpc/configs/ppc64_defconfig

+71 −102
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.15-rc5

# Tue Dec 20 15:59:38 2005

# Linux kernel version: 2.6.16-rc2

# Fri Feb 10 17:32:14 2006

#

CONFIG_PPC64=y

CONFIG_64BIT=y
@@ -16,6 +16,10 @@ CONFIG_COMPAT=y 
CONFIG_SYSVIPC_COMPAT=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

CONFIG_PPC_OF=y

CONFIG_PPC_UDBG_16550=y

CONFIG_GENERIC_TBSYNC=y

# CONFIG_DEFAULT_UIMAGE is not set



#

# Processor support
@@ -33,7 +37,6 @@ CONFIG_NR_CPUS=32 
# Code maturity level options

#

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -48,8 +51,6 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CPUSETS=y
@@ -59,8 +60,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y
@@ -69,8 +72,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 
CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support
@@ -113,7 +118,6 @@ CONFIG_PPC_PMAC=y 
CONFIG_PPC_PMAC64=y

CONFIG_PPC_MAPLE=y

# CONFIG_PPC_CELL is not set

CONFIG_PPC_OF=y

CONFIG_XICS=y

CONFIG_U3_DART=y

CONFIG_MPIC=y
@@ -124,8 +128,8 @@ CONFIG_RTAS_FLASH=m 
# CONFIG_MMIO_NVRAM is not set

CONFIG_MPIC_BROKEN_U3=y

CONFIG_IBMVIO=y

# CONFIG_IBMEBUS is not set

# CONFIG_PPC_MPC106 is not set

CONFIG_GENERIC_TBSYNC=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=y

# CONFIG_CPU_FREQ_DEBUG is not set
@@ -158,6 +162,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 
CONFIG_IOMMU_VMERGE=y

CONFIG_HOTPLUG_CPU=y

CONFIG_KEXEC=y

# CONFIG_CRASH_DUMP is not set

CONFIG_IRQ_ALL_CPUS=y

CONFIG_PPC_SPLPAR=y

CONFIG_EEH=y
@@ -178,6 +183,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y 
CONFIG_SPARSEMEM_EXTREME=y

# CONFIG_MEMORY_HOTPLUG is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

# CONFIG_PPC_64K_PAGES is not set

# CONFIG_SCHED_SMT is not set

CONFIG_PROC_DEVICETREE=y
@@ -221,6 +227,7 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y
@@ -260,6 +267,7 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK=y

CONFIG_NETFILTER_NETLINK_QUEUE=m

CONFIG_NETFILTER_NETLINK_LOG=m

# CONFIG_NETFILTER_XTABLES is not set



#

# IP: Netfilter Configuration
@@ -277,65 +285,6 @@ CONFIG_IP_NF_TFTP=m 
CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_LIMIT=m

CONFIG_IP_NF_MATCH_IPRANGE=m

CONFIG_IP_NF_MATCH_MAC=m

CONFIG_IP_NF_MATCH_PKTTYPE=m

CONFIG_IP_NF_MATCH_MARK=m

CONFIG_IP_NF_MATCH_MULTIPORT=m

CONFIG_IP_NF_MATCH_TOS=m

CONFIG_IP_NF_MATCH_RECENT=m

CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_DSCP=m

CONFIG_IP_NF_MATCH_AH_ESP=m

CONFIG_IP_NF_MATCH_LENGTH=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_MATCH_TCPMSS=m

CONFIG_IP_NF_MATCH_HELPER=m

CONFIG_IP_NF_MATCH_STATE=m

CONFIG_IP_NF_MATCH_CONNTRACK=m

CONFIG_IP_NF_MATCH_OWNER=m

CONFIG_IP_NF_MATCH_ADDRTYPE=m

CONFIG_IP_NF_MATCH_REALM=m

CONFIG_IP_NF_MATCH_SCTP=m

CONFIG_IP_NF_MATCH_DCCP=m

CONFIG_IP_NF_MATCH_COMMENT=m

CONFIG_IP_NF_MATCH_CONNMARK=m

CONFIG_IP_NF_MATCH_CONNBYTES=m

CONFIG_IP_NF_MATCH_HASHLIMIT=m

CONFIG_IP_NF_MATCH_STRING=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_LOG=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_IP_NF_TARGET_TCPMSS=m

CONFIG_IP_NF_TARGET_NFQUEUE=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_NAT_NEEDED=y

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_SAME=m

CONFIG_IP_NF_NAT_SNMP_BASIC=m

CONFIG_IP_NF_NAT_IRC=m

CONFIG_IP_NF_NAT_FTP=m

CONFIG_IP_NF_NAT_TFTP=m

CONFIG_IP_NF_NAT_AMANDA=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_TOS=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_DSCP=m

CONFIG_IP_NF_TARGET_MARK=m

CONFIG_IP_NF_TARGET_CLASSIFY=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_TARGET_CONNMARK=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_TARGET_NOTRACK=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m



#

# DCCP Configuration (EXPERIMENTAL)
@@ -346,6 +295,11 @@ CONFIG_IP_NF_ARP_MANGLE=m 
# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set



#

# TIPC Configuration (EXPERIMENTAL)

#

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set
@@ -364,7 +318,6 @@ CONFIG_LLC=y 
# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

CONFIG_NET_CLS_ROUTE=y



#

# Network testing
@@ -572,13 +525,7 @@ CONFIG_SCSI_IPR_TRACE=y 
CONFIG_SCSI_IPR_DUMP=y

# CONFIG_SCSI_QLOGIC_FC is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

CONFIG_SCSI_QLA2XXX=y

CONFIG_SCSI_QLA21XX=m

CONFIG_SCSI_QLA22XX=m

CONFIG_SCSI_QLA2300=m

CONFIG_SCSI_QLA2322=m

CONFIG_SCSI_QLA6312=m

CONFIG_SCSI_QLA24XX=m

# CONFIG_SCSI_QLA_FC is not set

CONFIG_SCSI_LPFC=m

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -642,8 +589,6 @@ CONFIG_IEEE1394_SBP2=m 
CONFIG_IEEE1394_ETH1394=m

CONFIG_IEEE1394_DV1394=m

CONFIG_IEEE1394_RAWIO=y

CONFIG_IEEE1394_CMP=m

CONFIG_IEEE1394_AMDTP=m



#

# I2O device support
@@ -659,6 +604,7 @@ CONFIG_THERM_PM72=y 
CONFIG_WINDFARM=y

CONFIG_WINDFARM_PM81=y

CONFIG_WINDFARM_PM91=y

CONFIG_WINDFARM_PM112=y



#

# Network device support
@@ -731,6 +677,7 @@ CONFIG_E1000=y 
# CONFIG_R8169 is not set

# CONFIG_SIS190 is not set

# CONFIG_SKGE is not set

# CONFIG_SKY2 is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y
@@ -853,6 +800,7 @@ CONFIG_HW_CONSOLE=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

# CONFIG_SERIAL_8250_EXTENDED is not set



#
@@ -880,6 +828,7 @@ CONFIG_HVCS=m 
# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set
@@ -923,8 +872,7 @@ CONFIG_I2C_AMD8111=y 
# CONFIG_I2C_I801 is not set

# CONFIG_I2C_I810 is not set

# CONFIG_I2C_PIIX4 is not set

CONFIG_I2C_KEYWEST=y

CONFIG_I2C_PMAC_SMU=y

CONFIG_I2C_POWERMAC=y

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set
@@ -956,6 +904,12 @@ CONFIG_I2C_PMAC_SMU=y 
# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set



#

# SPI support

#

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set



#

# Dallas's 1-wire bus

#
@@ -1028,7 +982,6 @@ CONFIG_FB_RADEON_I2C=y 
# CONFIG_FB_KYRO is not set

# CONFIG_FB_3DFX is not set

# CONFIG_FB_VOODOO1 is not set

# CONFIG_FB_CYBLA is not set

# CONFIG_FB_TRIDENT is not set

# CONFIG_FB_VIRTUAL is not set
@@ -1073,9 +1026,10 @@ CONFIG_SND_OSSEMUL=y 
CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

CONFIG_SND_GENERIC_DRIVER=y



#

# Generic devices
@@ -1089,6 +1043,8 @@ CONFIG_SND_GENERIC_DRIVER=y 
#

# PCI devices

#

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALS4000 is not set

# CONFIG_SND_ALI5451 is not set

# CONFIG_SND_ATIIXP is not set

# CONFIG_SND_ATIIXP_MODEM is not set
@@ -1097,39 +1053,38 @@ CONFIG_SND_GENERIC_DRIVER=y 
# CONFIG_SND_AU8830 is not set

# CONFIG_SND_AZT3328 is not set

# CONFIG_SND_BT87X is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_EMU10K1 is not set

# CONFIG_SND_EMU10K1X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_YMFPCI is not set

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALS4000 is not set

# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_ENS1370 is not set

# CONFIG_SND_ENS1371 is not set

# CONFIG_SND_ES1938 is not set

# CONFIG_SND_ES1968 is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_FM801 is not set

# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_ICE1712 is not set

# CONFIG_SND_ICE1724 is not set

# CONFIG_SND_INTEL8X0 is not set

# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_PCXHR is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_SONICVIBES is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_YMFPCI is not set



#

# ALSA PowerMac devices
@@ -1201,13 +1156,16 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_STORAGE_SDDR09 is not set

# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set

# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set

# CONFIG_USB_LIBUSUAL is not set



#

# USB Input Devices

#

CONFIG_USB_HID=y

CONFIG_USB_HIDINPUT=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

CONFIG_USB_HIDDEV=y

# CONFIG_USB_AIPTEK is not set
@@ -1221,6 +1179,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_YEALINK is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set

# CONFIG_USB_ATI_REMOTE2 is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set
@@ -1306,6 +1265,10 @@ CONFIG_INFINIBAND_IPOIB=m 
# SN Devices

#



#

# EDAC - error detection and reporting (RAS)

#



#

# File systems

#
@@ -1340,6 +1303,7 @@ CONFIG_XFS_EXPORT=y 
CONFIG_XFS_SECURITY=y

CONFIG_XFS_POSIX_ACL=y

# CONFIG_XFS_RT is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y
@@ -1379,6 +1343,7 @@ CONFIG_HUGETLBFS=y 
CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems
@@ -1449,6 +1414,7 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_SGI_PARTITION is not set

# CONFIG_ULTRIX_PARTITION is not set

# CONFIG_SUN_PARTITION is not set

# CONFIG_KARMA_PARTITION is not set

# CONFIG_EFI_PARTITION is not set



#
@@ -1504,10 +1470,6 @@ CONFIG_CRC32=y 
CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=m

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m



#

# Instrumentation Support
@@ -1520,18 +1482,20 @@ CONFIG_OPROFILE=y 
# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=17

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_VM is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_DEBUG_STACK_USAGE=y
@@ -1540,6 +1504,11 @@ CONFIG_XMON=y 
# CONFIG_XMON_DEFAULT is not set

CONFIG_IRQSTACKS=y

CONFIG_BOOTX_TEXT=y

# CONFIG_PPC_EARLY_DEBUG_LPAR is not set

# CONFIG_PPC_EARLY_DEBUG_G5 is not set

# CONFIG_PPC_EARLY_DEBUG_RTAS is not set

# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set

# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set



#

# Security options

arch/powerpc/configs/pseries_defconfig

+47 −80

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/kernel/crash.c

+3 −1
Original line number Diff line number Diff line
@@ -134,8 +134,10 @@ static void crash_kexec_prepare_cpus(void) 
	 * the crash CPU will send an IPI and wait for other CPUs to

	 * respond. If not, proceed the kexec boot even though we failed to

	 * capture other CPU states.

	 * Delay of at least 10 seconds.

	 */

	msecs = 1000000;

	printk(KERN_ALERT "Sending IPI to other cpus...\n");

	msecs = 10000;

	while ((atomic_read(&waiting_for_crash_ipi) > 0) && (--msecs > 0)) {

		barrier();

		mdelay(1);

arch/powerpc/kernel/head_32.S

+1 −0
Original line number Diff line number Diff line
@@ -714,6 +714,7 @@ AltiVecUnavailable: 
#ifdef CONFIG_ALTIVEC

	bne	load_up_altivec		/* if from user, just load it up */

#endif /* CONFIG_ALTIVEC */

	addi	r3,r1,STACK_FRAME_OVERHEAD

	EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception)



PerformanceMonitor: