Commit 8ba1f279 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix bugs in the hypervisor call stats code
  [POWERPC] Fix corruption in hcall9
  [POWERPC] iSeries: fix setup initcall
  [POWERPC] iSeries: fix viopath initialisation
  [POWERPC] iSeries: fix lpevents initialisation
  [POWERPC] iSeries: fix proc/iSeries initialisation
  [POWERPC] iSeries: fix mf proc initialisation
  [POWERPC] disable PReP and EFIKA during make oldconfig
  [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
  [POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds
  [POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices
  [POWERPC] 52xx: Don't use device_initcall to probe of_platform_bus
  [POWERPC] Add legacy iSeries to ppc64_defconfig
  [POWERPC] Update ppc64_defconfig
  [POWERPC] Fix manual assembly WARN_ON() in enter_rtas().
  [POWERPC] Avoid calling get_irq_server() with a real, not virtual irq.
  [POWERPC] Fix unbalanced uses of of_node_put
  [POWERPC] Fix bogus BUG_ON() in in hugetlb_get_unmapped_area()
parents 599c8531 dc40127c

Documentation/powerpc/mpc52xx-device-tree-bindings.txt

+2 −2
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ rtc@<addr> rtc *-rtc Real time clock 
mscan@<addr>	mscan		*-mscan		CAN bus controller

pci@<addr>	pci		*-pci		PCI bridge

serial@<addr>	serial		*-psc-uart	PSC in serial mode

i2s@<addr>	i2s		*-psc-i2s	PSC in i2s mode

ac97@<addr>	ac97		*-psc-ac97	PSC in ac97 mode

i2s@<addr>	sound		*-psc-i2s	PSC in i2s mode

ac97@<addr>	sound		*-psc-ac97	PSC in ac97 mode

spi@<addr>	spi		*-psc-spi	PSC in spi mode

irda@<addr>	irda		*-psc-irda	PSC in IrDA mode

spi@<addr>	spi		*-spi		MPC52xx spi device

arch/powerpc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ config PPC_EFIKA 
	select RTAS_PROC

	select PPC_MPC52xx

	select PPC_NATIVE

	default y

	default n



config PPC_LITE5200

	bool "Freescale Lite5200 Eval Board"
@@ -471,7 +471,7 @@ config PPC_PREP 
	select PPC_INDIRECT_PCI

	select PPC_UDBG_16550

	select PPC_NATIVE

	default y

	default n



config PPC_MAPLE

	depends on PPC_MULTIPLATFORM && PPC64

arch/powerpc/boot/dts/lite5200.dts

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ 


		// PSC3 in CODEC mode example

		i2s@2400 {		// PSC3

			device_type = "i2s";

			device_type = "sound";

			compatible = "mpc5200-psc-i2s\0mpc52xx-psc-i2s";

			reg = <2400 100>;

			interrupts = <2 3 0>;
@@ -265,7 +265,7 @@ 


		// PSC6 in AC97 mode example

		ac97@2c00 {		// PSC6

			device_type = "ac97";

			device_type = "sound";

			compatible = "mpc5200-psc-ac97\0mpc52xx-psc-ac97";

			reg = <2c00 100>;

			interrupts = <2 4 0>;

arch/powerpc/boot/dts/lite5200b.dts

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ 


		// PSC3 in CODEC mode example

		i2s@2400 {		// PSC3

			device_type = "i2s";

			device_type = "sound";

			compatible = "mpc5200b-psc-i2s\0mpc52xx-psc-i2s";

			reg = <2400 100>;

			interrupts = <2 3 0>;
@@ -270,7 +270,7 @@ 


		// PSC6 in AC97 mode example

		ac97@2c00 {		// PSC6

			device_type = "ac97";

			device_type = "sound";

			compatible = "mpc5200b-psc-ac97\0mpc52xx-psc-ac97";

			reg = <2c00 100>;

			interrupts = <2 4 0>;

arch/powerpc/configs/ppc64_defconfig

+196 −55
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18-rc6

# Sun Sep 10 10:45:11 2006

# Linux kernel version: 2.6.20-rc3

# Tue Jan  2 15:32:44 2007

#

CONFIG_PPC64=y

CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y 
CONFIG_GENERIC_HARDIRQS=y

CONFIG_IRQ_PER_CPU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_ARCH_HAS_ILOG2_U32=y

CONFIG_ARCH_HAS_ILOG2_U64=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -22,6 +24,8 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y 
CONFIG_PPC_OF=y

CONFIG_PPC_UDBG_16550=y

CONFIG_GENERIC_TBSYNC=y

CONFIG_AUDIT_ARCH=y

CONFIG_GENERIC_BUG=y

# CONFIG_DEFAULT_UIMAGE is not set



#
@@ -31,6 +35,10 @@ CONFIG_GENERIC_TBSYNC=y 
CONFIG_POWER3=y

CONFIG_POWER4=y

CONFIG_PPC_FPU=y

# CONFIG_PPC_DCR_NATIVE is not set

CONFIG_PPC_DCR_MMIO=y

CONFIG_PPC_DCR=y

CONFIG_PPC_OF_PLATFORM_PCI=y

CONFIG_ALTIVEC=y

CONFIG_PPC_STD_MMU=y

CONFIG_VIRT_CPU_ACCOUNTING=y
@@ -52,19 +60,24 @@ CONFIG_LOCALVERSION="" 
CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_SYSCTL=y

# CONFIG_UTS_NS is not set

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CPUSETS=y

CONFIG_SYSFS_DEPRECATED=y

CONFIG_RELAY=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_TASK_XACCT is not set

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -73,12 +86,12 @@ CONFIG_PRINTK=y 
CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_RT_MUTEXES=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set
@@ -97,6 +110,7 @@ CONFIG_STOP_MACHINE=y 
#

# Block layer

#

CONFIG_BLOCK=y

CONFIG_BLK_DEV_IO_TRACE=y



#
@@ -116,16 +130,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# Platform support

#

CONFIG_PPC_MULTIPLATFORM=y

# CONFIG_PPC_ISERIES is not set

# CONFIG_EMBEDDED6xx is not set

# CONFIG_APUS is not set

CONFIG_PPC_PSERIES=y

CONFIG_PPC_ISERIES=y

# CONFIG_PPC_MPC52xx is not set

CONFIG_PPC_PMAC=y

CONFIG_PPC_PMAC64=y

CONFIG_PPC_MAPLE=y

# CONFIG_PPC_PASEMI is not set

CONFIG_PPC_CELL=y

CONFIG_PPC_CELL_NATIVE=y

CONFIG_PPC_IBM_CELL_BLADE=y

# CONFIG_PPC_PS3 is not set

CONFIG_PPC_NATIVE=y

CONFIG_UDBG_RTAS_CONSOLE=y

CONFIG_XICS=y

CONFIG_U3_DART=y
@@ -139,6 +157,8 @@ CONFIG_IBMVIO=y 
# CONFIG_IBMEBUS is not set

# CONFIG_PPC_MPC106 is not set

CONFIG_PPC_970_NAP=y

CONFIG_PPC_INDIRECT_IO=y

CONFIG_GENERIC_IOMAP=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=y

# CONFIG_CPU_FREQ_DEBUG is not set
@@ -160,14 +180,16 @@ CONFIG_MPIC=y 
#

CONFIG_SPU_FS=m

CONFIG_SPU_BASE=y

CONFIG_SPUFS_MMAP=y

CONFIG_CBE_RAS=y

CONFIG_CBE_THERM=m

CONFIG_CBE_CPUFREQ=m



#

# Kernel options

#

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

CONFIG_PREEMPT_NONE=y
@@ -192,6 +214,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y 
CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_DEFAULT=y

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_SELECT_MEMORY_MODEL=y

# CONFIG_FLATMEM_MANUAL is not set

# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -201,6 +224,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y 
# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG_SPARSE=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_RESOURCES_64BIT=y

CONFIG_ARCH_MEMORY_PROBE=y
@@ -222,6 +246,7 @@ CONFIG_PPC_I8259=y 
CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCIEPORTBUS is not set

# CONFIG_PCI_MULTITHREAD_PROBE is not set

# CONFIG_PCI_DEBUG is not set



#
@@ -254,6 +279,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_XFRM=y

CONFIG_XFRM_USER=m

# CONFIG_XFRM_SUB_POLICY is not set

CONFIG_NET_KEY=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y
@@ -272,10 +298,13 @@ CONFIG_INET_XFRM_TUNNEL=m 
CONFIG_INET_TUNNEL=y

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set



#

# IP: Virtual Server Configuration
@@ -294,25 +323,31 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK=y

CONFIG_NETFILTER_NETLINK_QUEUE=m

CONFIG_NETFILTER_NETLINK_LOG=m

CONFIG_NF_CONNTRACK_ENABLED=m

CONFIG_NF_CONNTRACK_SUPPORT=y

# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CT_ACCT=y

CONFIG_NF_CONNTRACK_MARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_GRE=m

CONFIG_NF_CT_PROTO_SCTP=m

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m

CONFIG_NF_CONNTRACK_IRC=m

CONFIG_NF_CONNTRACK_NETBIOS_NS=m

CONFIG_NF_CONNTRACK_PPTP=m

CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_CT_NETLINK=m

# CONFIG_NETFILTER_XTABLES is not set



#

# IP: Netfilter Configuration

#

CONFIG_IP_NF_CONNTRACK=m

CONFIG_IP_NF_CT_ACCT=y

CONFIG_IP_NF_CONNTRACK_MARK=y

CONFIG_IP_NF_CONNTRACK_EVENTS=y

CONFIG_IP_NF_CONNTRACK_NETLINK=m

CONFIG_IP_NF_CT_PROTO_SCTP=m

CONFIG_IP_NF_FTP=m

CONFIG_IP_NF_IRC=m

# CONFIG_IP_NF_NETBIOS_NS is not set

CONFIG_IP_NF_TFTP=m

CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

# CONFIG_IP_NF_H323 is not set

CONFIG_IP_NF_SIP=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_CONNTRACK_PROC_COMPAT=y

CONFIG_IP_NF_QUEUE=m



#
@@ -339,7 +374,6 @@ CONFIG_LLC=y 
# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set
@@ -411,6 +445,12 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# Misc devices

#

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set



#

# ATA/ATAPI/MFM/RLL support

#
@@ -438,7 +478,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y 
# CONFIG_BLK_DEV_OFFBOARD is not set

CONFIG_BLK_DEV_GENERIC=y

# CONFIG_BLK_DEV_OPTI621 is not set

CONFIG_BLK_DEV_SL82C105=y

CONFIG_BLK_DEV_IDEDMA_PCI=y

# CONFIG_BLK_DEV_IDEDMA_FORCED is not set

CONFIG_IDEDMA_PCI_AUTO=y
@@ -453,6 +492,7 @@ CONFIG_BLK_DEV_AMD74XX=y 
# CONFIG_BLK_DEV_CS5530 is not set

# CONFIG_BLK_DEV_HPT34X is not set

# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_JMICRON is not set

# CONFIG_BLK_DEV_SC1200 is not set

# CONFIG_BLK_DEV_PIIX is not set

# CONFIG_BLK_DEV_IT821X is not set
@@ -461,6 +501,7 @@ CONFIG_BLK_DEV_AMD74XX=y 
# CONFIG_BLK_DEV_PDC202XX_NEW is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

CONFIG_BLK_DEV_SL82C105=y

# CONFIG_BLK_DEV_SLC90E66 is not set

# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -478,6 +519,8 @@ CONFIG_IDEDMA_AUTO=y 
#

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

# CONFIG_SCSI_TGT is not set

CONFIG_SCSI_NETLINK=y

CONFIG_SCSI_PROC_FS=y



#
@@ -497,14 +540,16 @@ CONFIG_CHR_DEV_SG=y 
CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_CONSTANTS=y

# CONFIG_SCSI_LOGGING is not set

# CONFIG_SCSI_SCAN_ASYNC is not set



#

# SCSI Transport Attributes

# SCSI Transports

#

CONFIG_SCSI_SPI_ATTRS=y

CONFIG_SCSI_FC_ATTRS=y

CONFIG_SCSI_ISCSI_ATTRS=m

# CONFIG_SCSI_SAS_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set



#

# SCSI low-level drivers
@@ -517,26 +562,12 @@ CONFIG_SCSI_ISCSI_ATTRS=m 
# CONFIG_SCSI_AIC7XXX is not set

# CONFIG_SCSI_AIC7XXX_OLD is not set

# CONFIG_SCSI_AIC79XX is not set

# CONFIG_SCSI_AIC94XX is not set

# CONFIG_SCSI_ARCMSR is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

CONFIG_ATA=y

# CONFIG_SATA_AHCI is not set

CONFIG_SATA_SVW=y

# CONFIG_SCSI_ATA_PIIX is not set

# CONFIG_SATA_MV is not set

# CONFIG_SATA_NV is not set

# CONFIG_SCSI_PDC_ADMA is not set

# CONFIG_SCSI_HPTIOP is not set

# CONFIG_SATA_QSTOR is not set

# CONFIG_SATA_PROMISE is not set

# CONFIG_SATA_SX4 is not set

# CONFIG_SATA_SIL is not set

# CONFIG_SATA_SIL24 is not set

# CONFIG_SATA_SIS is not set

# CONFIG_SATA_ULI is not set

# CONFIG_SATA_VIA is not set

# CONFIG_SATA_VITESSE is not set

# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set
@@ -546,6 +577,7 @@ CONFIG_SATA_SVW=y 
CONFIG_SCSI_IBMVSCSI=y

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_STEX is not set

CONFIG_SCSI_SYM53C8XX_2=y

CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0

CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
@@ -556,10 +588,66 @@ CONFIG_SCSI_IPR_TRACE=y 
CONFIG_SCSI_IPR_DUMP=y

# CONFIG_SCSI_QLOGIC_1280 is not set

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_QLA_ISCSI is not set

CONFIG_SCSI_LPFC=m

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set

CONFIG_SCSI_DEBUG=m

# CONFIG_SCSI_SRP is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers

#

CONFIG_ATA=y

# CONFIG_SATA_AHCI is not set

CONFIG_SATA_SVW=y

# CONFIG_ATA_PIIX is not set

# CONFIG_SATA_MV is not set

# CONFIG_SATA_NV is not set

# CONFIG_PDC_ADMA is not set

# CONFIG_SATA_QSTOR is not set

# CONFIG_SATA_PROMISE is not set

# CONFIG_SATA_SX4 is not set

# CONFIG_SATA_SIL is not set

# CONFIG_SATA_SIL24 is not set

# CONFIG_SATA_SIS is not set

# CONFIG_SATA_ULI is not set

# CONFIG_SATA_VIA is not set

# CONFIG_SATA_VITESSE is not set

# CONFIG_PATA_ALI is not set

# CONFIG_PATA_AMD is not set

# CONFIG_PATA_ARTOP is not set

# CONFIG_PATA_ATIIXP is not set

# CONFIG_PATA_CMD64X is not set

# CONFIG_PATA_CS5520 is not set

# CONFIG_PATA_CS5530 is not set

# CONFIG_PATA_CYPRESS is not set

# CONFIG_PATA_EFAR is not set

# CONFIG_ATA_GENERIC is not set

# CONFIG_PATA_HPT366 is not set

# CONFIG_PATA_HPT37X is not set

# CONFIG_PATA_HPT3X2N is not set

# CONFIG_PATA_HPT3X3 is not set

# CONFIG_PATA_IT821X is not set

# CONFIG_PATA_JMICRON is not set

# CONFIG_PATA_TRIFLEX is not set

# CONFIG_PATA_MARVELL is not set

# CONFIG_PATA_MPIIX is not set

# CONFIG_PATA_OLDPIIX is not set

# CONFIG_PATA_NETCELL is not set

# CONFIG_PATA_NS87410 is not set

# CONFIG_PATA_OPTI is not set

# CONFIG_PATA_OPTIDMA is not set

# CONFIG_PATA_PDC_OLD is not set

# CONFIG_PATA_RADISYS is not set

# CONFIG_PATA_RZ1000 is not set

# CONFIG_PATA_SC1200 is not set

# CONFIG_PATA_SERVERWORKS is not set

# CONFIG_PATA_PDC2027X is not set

# CONFIG_PATA_SIL680 is not set

# CONFIG_PATA_SIS is not set

# CONFIG_PATA_VIA is not set

# CONFIG_PATA_WINBOND is not set



#

# Multi-device support (RAID and LVM)
@@ -575,6 +663,7 @@ CONFIG_MD_RAID5_RESHAPE=y 
CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_BLK_DEV_DM=y

# CONFIG_DM_DEBUG is not set

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_MIRROR=m
@@ -630,11 +719,13 @@ CONFIG_IEEE1394_RAWIO=y 
CONFIG_ADB_PMU=y

# CONFIG_ADB_PMU_LED is not set

CONFIG_PMAC_SMU=y

# CONFIG_MAC_EMUMOUSEBTN is not set

CONFIG_THERM_PM72=y

CONFIG_WINDFARM=y

CONFIG_WINDFARM_PM81=y

CONFIG_WINDFARM_PM91=y

CONFIG_WINDFARM_PM112=y

# CONFIG_PMAC_RACKMETER is not set



#

# Network device support
@@ -675,6 +766,7 @@ CONFIG_VORTEX=y 
CONFIG_IBMVETH=m

CONFIG_NET_PCI=y

CONFIG_PCNET32=y

# CONFIG_PCNET32_NAPI is not set

# CONFIG_AMD8111_ETH is not set

# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_B44 is not set
@@ -713,7 +805,7 @@ CONFIG_E1000=y 
CONFIG_TIGON3=y

# CONFIG_BNX2 is not set

CONFIG_SPIDER_NET=m

# CONFIG_MV643XX_ETH is not set

# CONFIG_QLA3XXX is not set



#

# Ethernet (10000 Mbit)
@@ -723,6 +815,7 @@ CONFIG_IXGB=m 
# CONFIG_IXGB_NAPI is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set



#

# Token Ring devices
@@ -741,6 +834,7 @@ CONFIG_IBMOL=y 
# Wan interfaces

#

# CONFIG_WAN is not set

CONFIG_ISERIES_VETH=m

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set

CONFIG_PPP=m
@@ -753,6 +847,7 @@ CONFIG_PPP_BSDCOMP=m 
# CONFIG_PPP_MPPE is not set

CONFIG_PPPOE=m

# CONFIG_SLIP is not set

CONFIG_SLHC=m

# CONFIG_NET_FC is not set

# CONFIG_SHAPER is not set

CONFIG_NETCONSOLE=y
@@ -775,6 +870,7 @@ CONFIG_NET_POLL_CONTROLLER=y 
# Input device support

#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set



#

# Userland interfaces
@@ -797,6 +893,7 @@ CONFIG_KEYBOARD_ATKBD=y 
# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_INPUT_MOUSE=y

CONFIG_MOUSE_PS2=y

# CONFIG_MOUSE_SERIAL is not set
@@ -850,6 +947,7 @@ CONFIG_LEGACY_PTYS=y 
CONFIG_LEGACY_PTY_COUNT=256

CONFIG_HVC_DRIVER=y

CONFIG_HVC_CONSOLE=y

CONFIG_HVC_ISERIES=y

CONFIG_HVC_RTAS=y

CONFIG_HVCS=m
@@ -868,10 +966,6 @@ CONFIG_GEN_RTC=y 
# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set



#

# Ftape, the floppy tape device driver

#

# CONFIG_AGP is not set

# CONFIG_DRM is not set

CONFIG_RAW_DRIVER=y
@@ -882,7 +976,6 @@ CONFIG_MAX_RAW_DEVS=256 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -947,6 +1040,7 @@ CONFIG_I2C_POWERMAC=y 
#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support
@@ -954,15 +1048,10 @@ CONFIG_I2C_POWERMAC=y 
# CONFIG_HWMON is not set

# CONFIG_HWMON_VID is not set



#

# Misc devices

#



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y



#

# Digital Video Broadcasting Devices
@@ -975,6 +1064,7 @@ CONFIG_VIDEO_V4L2=y 
#

CONFIG_FIRMWARE_EDID=y

CONFIG_FB=y

CONFIG_FB_DDC=y

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1011,6 +1101,7 @@ CONFIG_FB_RADEON_I2C=y 
# CONFIG_FB_3DFX is not set

# CONFIG_FB_VOODOO1 is not set

# CONFIG_FB_TRIDENT is not set

CONFIG_FB_IBM_GXT4500=y

# CONFIG_FB_VIRTUAL is not set



#
@@ -1158,6 +1249,11 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m 
#

# CONFIG_SOUND_PRIME is not set



#

# HID Devices

#

CONFIG_HID=y



#

# USB support

#
@@ -1173,6 +1269,7 @@ CONFIG_USB=y 
CONFIG_USB_DEVICEFS=y

# CONFIG_USB_BANDWIDTH is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_MULTITHREAD_PROBE is not set

# CONFIG_USB_OTG is not set



#
@@ -1214,13 +1311,13 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_STORAGE_JUMPSHOT is not set

# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set

# CONFIG_USB_STORAGE_KARMA 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
@@ -1250,6 +1347,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_KAWETH is not set

# CONFIG_USB_PEGASUS is not set

# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_USBNET_MII is not set

# CONFIG_USB_USBNET is not set

# CONFIG_USB_MON is not set
@@ -1267,6 +1365,7 @@ CONFIG_USB_HIDDEV=y 
#

# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_ADUTUX is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set
@@ -1274,12 +1373,13 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

CONFIG_USB_APPLEDISPLAY=m

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set

# CONFIG_USB_TRANCEVIBRATOR is not set

# CONFIG_USB_TEST is not set



#
@@ -1318,6 +1418,7 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_ADDR_TRANS=y

CONFIG_INFINIBAND_MTHCA=m

CONFIG_INFINIBAND_MTHCA_DEBUG=y

# CONFIG_INFINIBAND_AMSO1100 is not set

CONFIG_INFINIBAND_IPOIB=m

CONFIG_INFINIBAND_IPOIB_DEBUG=y

# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
@@ -1346,6 +1447,10 @@ CONFIG_INFINIBAND_ISER=m 
# DMA Devices

#



#

# Virtualization

#



#

# File systems

#
@@ -1359,6 +1464,7 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT3_FS_XATTR=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

# CONFIG_EXT4DEV_FS is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

CONFIG_FS_MBCACHE=y
@@ -1379,6 +1485,7 @@ CONFIG_XFS_FS=m 
CONFIG_XFS_SECURITY=y

CONFIG_XFS_POSIX_ACL=y

# CONFIG_XFS_RT is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set
@@ -1414,8 +1521,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 
#

CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y
@@ -1539,9 +1648,24 @@ CONFIG_NLS_KOI8_R=m 
CONFIG_NLS_KOI8_U=m

CONFIG_NLS_UTF8=m



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# iSeries device drivers

#

# CONFIG_VIOCONS is not set

CONFIG_VIODASD=y

CONFIG_VIOCD=m

CONFIG_VIOTAPE=m

CONFIG_VIOPATH=y



#

# Library routines

#

CONFIG_BITREVERSE=y

CONFIG_CRC_CCITT=m

# CONFIG_CRC16 is not set

CONFIG_CRC32=y
@@ -1551,6 +1675,7 @@ CONFIG_ZLIB_DEFLATE=m 
CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_PLIST=y

CONFIG_IOMAP_COPY=y



#

# Instrumentation Support
@@ -1563,8 +1688,11 @@ CONFIG_OPROFILE=y 
# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=17

CONFIG_DETECT_SOFTLOCKUP=y
@@ -1578,16 +1706,19 @@ CONFIG_DEBUG_MUTEXES=y 
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_DEBUG_STACK_USAGE=y

# CONFIG_HCALL_STATS is not set

CONFIG_DEBUGGER=y

CONFIG_XMON=y

# CONFIG_XMON_DEFAULT is not set

CONFIG_XMON_DISASSEMBLY=y

CONFIG_IRQSTACKS=y

CONFIG_BOOTX_TEXT=y

# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1602,7 +1733,12 @@ CONFIG_BOOTX_TEXT=y 
# Cryptographic options

#

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_HMAC=y

# CONFIG_CRYPTO_XCBC is not set

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y
@@ -1611,9 +1747,14 @@ CONFIG_CRYPTO_SHA256=m 
CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_TGR192=m

# CONFIG_CRYPTO_GF128MUL is not set

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_CBC=y

# CONFIG_CRYPTO_LRW is not set

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_TWOFISH_COMMON=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_AES=m

CONFIG_CRYPTO_CAST5=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE