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

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

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/ps3: ps3_defconfig updates
  powerpc/mm: Respect _PAGE_COHERENT on classic ppc32 SW
  powerpc/5200: Enable CPU_FTR_NEED_COHERENT for MPC52xx
  ps3/block: Replace mtd/ps3vram by block/ps3vram
parents 8144737d 9aac3975

arch/powerpc/configs/ps3_defconfig

+190 −60
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.27-rc3

# Wed Aug 20 08:16:53 2008

# Linux kernel version: 2.6.29-rc8

# Fri Mar 13 09:28:45 2009

#

CONFIG_PPC64=y
@@ -16,13 +16,14 @@ CONFIG_PPC_FPU=y 
CONFIG_ALTIVEC=y

# CONFIG_VSX is not set

CONFIG_PPC_STD_MMU=y

CONFIG_PPC_STD_MMU_64=y

CONFIG_PPC_MM_SLICES=y

CONFIG_VIRT_CPU_ACCOUNTING=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_64BIT=y

CONFIG_WORD_SIZE=64

CONFIG_PPC_MERGE=y

CONFIG_ARCH_PHYS_ADDR_T_64BIT=y

CONFIG_MMU=y

CONFIG_GENERIC_CMOS_UPDATE=y

CONFIG_GENERIC_TIME=y
@@ -46,7 +47,7 @@ CONFIG_PPC=y 
CONFIG_EARLY_PRINTK=y

CONFIG_COMPAT=y

CONFIG_SYSVIPC_COMPAT=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_SCHED_OMIT_FRAME_POINTER=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

CONFIG_PPC_OF=y

CONFIG_OF=y
@@ -74,10 +75,19 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set



#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=17

# CONFIG_CGROUPS is not set

# CONFIG_GROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set
@@ -86,11 +96,13 @@ CONFIG_NAMESPACES=y 
# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_ANON_INODES=y

CONFIG_EMBEDDED=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y
@@ -99,37 +111,36 @@ CONFIG_HOTPLUG=y 
CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

# CONFIG_COMPAT_BRK is not set

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

CONFIG_PROFILING=y

# CONFIG_MARKERS is not set

CONFIG_TRACEPOINTS=y

CONFIG_MARKERS=y

CONFIG_OPROFILE=m

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y

CONFIG_HAVE_SYSCALL_WRAPPERS=y

CONFIG_HAVE_IOREMAP_PROT=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_DMA_ATTRS=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

# CONFIG_HAVE_CLK is not set

CONFIG_PROC_PAGE_MONITOR=y

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_MODULES=y

# CONFIG_MODULE_FORCE_LOAD is not set
@@ -137,7 +148,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y

CONFIG_BLOCK=y

# CONFIG_BLK_DEV_IO_TRACE is not set
@@ -157,7 +167,7 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_FREEZER is not set



#

# Platform support
@@ -183,18 +193,20 @@ CONFIG_PS3_STORAGE=y 
CONFIG_PS3_DISK=y

CONFIG_PS3_ROM=y

CONFIG_PS3_FLASH=y

CONFIG_OPROFILE_PS3=y

CONFIG_PS3_VRAM=m

CONFIG_PS3_LPM=m

CONFIG_PPC_CELL=y

# CONFIG_PPC_CELL_NATIVE is not set

# CONFIG_PPC_IBM_CELL_BLADE is not set

# CONFIG_PPC_CELLEB is not set

# CONFIG_PPC_CELL_QPACE is not set



#

# Cell Broadband Engine options

#

CONFIG_SPU_FS=y

CONFIG_SPU_FS_64K_LS=y

# CONFIG_SPU_TRACE is not set

CONFIG_SPU_BASE=y

# CONFIG_PQ2ADS is not set

# CONFIG_IPIC is not set
@@ -210,6 +222,7 @@ CONFIG_SPU_BASE=y 
# CONFIG_GENERIC_IOMAP is not set

# CONFIG_CPU_FREQ is not set

# CONFIG_FSL_ULI1575 is not set

# CONFIG_SIMPLE_GPIO is not set



#

# Kernel options
@@ -229,6 +242,8 @@ CONFIG_PREEMPT_NONE=y 
# CONFIG_PREEMPT is not set

CONFIG_BINFMT_ELF=y

CONFIG_COMPAT_BINFMT_ELF=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_HAVE_AOUT is not set

CONFIG_BINFMT_MISC=y

CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y

# CONFIG_IOMMU_VMERGE is not set
@@ -251,7 +266,6 @@ CONFIG_SELECT_MEMORY_MODEL=y 
CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y

# CONFIG_SPARSEMEM_VMEMMAP is not set
@@ -261,11 +275,14 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y 
CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

CONFIG_RESOURCES_64BIT=y

CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_ARCH_MEMORY_PROBE=y

CONFIG_PPC_HAS_HASH_64K=y

CONFIG_PPC_4K_PAGES=y

# CONFIG_PPC_16K_PAGES is not set

# CONFIG_PPC_64K_PAGES is not set

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_SCHED_SMT=y
@@ -299,6 +316,7 @@ CONFIG_NET=y 
#

# Networking options

#

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y
@@ -361,6 +379,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y 
# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_NET_DSA is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set
@@ -371,6 +390,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set



#

# Network testing
@@ -392,39 +412,37 @@ CONFIG_BT_HIDP=m 
#

# Bluetooth device drivers

#

CONFIG_BT_HCIUSB=m

CONFIG_BT_HCIUSB_SCO=y

CONFIG_BT_HCIBTUSB=m

# CONFIG_BT_HCIUART is not set

# CONFIG_BT_HCIBCM203X is not set

# CONFIG_BT_HCIBPA10X is not set

# CONFIG_BT_HCIBFUSB is not set

# CONFIG_BT_HCIVHCI is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_PHONET is not set

CONFIG_WIRELESS=y

CONFIG_CFG80211=m

# CONFIG_CFG80211_REG_DEBUG is not set

CONFIG_NL80211=y

# CONFIG_WIRELESS_OLD_REGULATORY is not set

CONFIG_WIRELESS_EXT=y

# CONFIG_WIRELESS_EXT_SYSFS is not set

# CONFIG_LIB80211 is not set

CONFIG_MAC80211=m



#

# Rate control algorithm selection

#

CONFIG_MAC80211_RC_PID=y

# CONFIG_MAC80211_RC_MINSTREL is not set

CONFIG_MAC80211_RC_DEFAULT_PID=y

# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set

CONFIG_MAC80211_RC_DEFAULT="pid"

# CONFIG_MAC80211_MESH is not set

# CONFIG_MAC80211_LEDS is not set

# CONFIG_MAC80211_DEBUGFS is not set

# CONFIG_MAC80211_DEBUG_MENU is not set

CONFIG_IEEE80211=m

# CONFIG_IEEE80211_DEBUG is not set

CONFIG_IEEE80211_CRYPT_WEP=m

CONFIG_IEEE80211_CRYPT_CCMP=m

CONFIG_IEEE80211_CRYPT_TKIP=m

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -450,6 +468,7 @@ CONFIG_MTD_DEBUG=y 
CONFIG_MTD_DEBUG_VERBOSE=0

# CONFIG_MTD_CONCAT is not set

# CONFIG_MTD_PARTITIONS is not set

# CONFIG_MTD_TESTS is not set



#

# User Modules And Translation Layers
@@ -494,7 +513,6 @@ CONFIG_MTD_CFI_I2=y 
#

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

CONFIG_MTD_PS3VRAM=y

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLOCK2MTD is not set
@@ -507,6 +525,11 @@ CONFIG_MTD_PS3VRAM=y 
# CONFIG_MTD_NAND is not set

# CONFIG_MTD_ONENAND is not set



#

# LPDDR flash memory drivers

#

# CONFIG_MTD_LPDDR is not set



#

# UBI - Unsorted block images

#
@@ -528,8 +551,13 @@ CONFIG_BLK_DEV_RAM_SIZE=65535 
# CONFIG_ATA_OVER_ETH is not set

# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -575,7 +603,17 @@ CONFIG_SCSI_WAIT_SCAN=m 
# CONFIG_SCSI_LOWLEVEL is not set

# CONFIG_SCSI_DH is not set

# CONFIG_ATA is not set

# CONFIG_MD is not set

CONFIG_MD=y

# CONFIG_BLK_DEV_MD is not set

CONFIG_BLK_DEV_DM=m

# CONFIG_DM_DEBUG is not set

# CONFIG_DM_CRYPT is not set

# CONFIG_DM_SNAPSHOT is not set

# CONFIG_DM_MIRROR is not set

# CONFIG_DM_ZERO is not set

# CONFIG_DM_MULTIPATH is not set

# CONFIG_DM_DELAY is not set

# CONFIG_DM_UEVENT is not set

# CONFIG_MACINTOSH_DRIVERS is not set

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set
@@ -591,6 +629,9 @@ CONFIG_MII=m 
# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

# CONFIG_B44 is not set

CONFIG_NETDEV_1000=y

CONFIG_GELIC_NET=y
@@ -604,6 +645,7 @@ CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y 
# CONFIG_WLAN_PRE80211 is not set

CONFIG_WLAN_80211=y

# CONFIG_LIBERTAS is not set

# CONFIG_LIBERTAS_THINFIRM is not set

# CONFIG_USB_ZD1201 is not set

# CONFIG_USB_NET_RNDIS_WLAN is not set

# CONFIG_RTL8187 is not set
@@ -615,13 +657,11 @@ CONFIG_WLAN_80211=y 
# CONFIG_B43LEGACY is not set

CONFIG_ZD1211RW=m

# CONFIG_ZD1211RW_DEBUG is not set

CONFIG_RT2X00=m

CONFIG_RT2X00_LIB=m

CONFIG_RT2X00_LIB_USB=m

CONFIG_RT2X00_LIB_FIRMWARE=y

# CONFIG_RT2500USB is not set

CONFIG_RT73USB=m

# CONFIG_RT2X00_DEBUG is not set

# CONFIG_RT2X00 is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers

#



#

# USB Network Adapters
@@ -634,6 +674,7 @@ CONFIG_USB_USBNET=m 
CONFIG_USB_NET_AX8817X=m

# CONFIG_USB_NET_CDCETHER is not set

# CONFIG_USB_NET_DM9601 is not set

# CONFIG_USB_NET_SMSC95XX is not set

# CONFIG_USB_NET_GL620A is not set

# CONFIG_USB_NET_NET1080 is not set

# CONFIG_USB_NET_PLUSB is not set
@@ -664,7 +705,7 @@ CONFIG_SLHC=m 
# Input device support

#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

CONFIG_INPUT_FF_MEMLESS=m

# CONFIG_INPUT_POLLDEV is not set



#
@@ -735,8 +776,10 @@ CONFIG_DEVKMEM=y 
# Non-8250 serial port support

#

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=16

# CONFIG_HVC_UDBG is not set

# CONFIG_IPMI_HANDLER is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_R3964 is not set
@@ -753,11 +796,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 
# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

CONFIG_SSB_POSSIBLE=y



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#
@@ -767,6 +810,7 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_REGULATOR is not set



#

# Multimedia devices
@@ -792,6 +836,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m 
CONFIG_FB=y

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB_DDC is not set

# CONFIG_FB_BOOT_VESA_SUPPORT is not set

# CONFIG_FB_CFB_FILLRECT is not set

# CONFIG_FB_CFB_COPYAREA is not set

# CONFIG_FB_CFB_IMAGEBLIT is not set
@@ -817,6 +862,8 @@ CONFIG_FB_SYS_FOPS=y 
CONFIG_FB_PS3=y

CONFIG_FB_PS3_DEFAULT_SIZE_M=9

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -841,6 +888,7 @@ CONFIG_FB_LOGO_EXTRA=y 
# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_LOGO_LINUX_CLUT224=y

CONFIG_SOUND=m

# CONFIG_SOUND_OSS_CORE is not set

CONFIG_SND=m

CONFIG_SND_TIMER=m

CONFIG_SND_PCM=m
@@ -849,6 +897,7 @@ CONFIG_SND_RAWMIDI=m 
# CONFIG_SND_SEQUENCER is not set

# CONFIG_SND_MIXER_OSS is not set

# CONFIG_SND_PCM_OSS is not set

# CONFIG_SND_HRTIMER is not set

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

CONFIG_SND_VERBOSE_PROCFS=y
@@ -873,15 +922,40 @@ CONFIG_HIDRAW=y 
# USB Input Devices

#

CONFIG_USB_HID=m

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

# CONFIG_USB_HIDDEV is not set

# CONFIG_HID_PID is not set

CONFIG_USB_HIDDEV=y



#

# USB HID Boot Protocol drivers

#

# CONFIG_USB_KBD is not set

# CONFIG_USB_MOUSE is not set



#

# Special HID drivers

#

# CONFIG_HID_COMPAT is not set

# CONFIG_HID_A4TECH is not set

# CONFIG_HID_APPLE is not set

# CONFIG_HID_BELKIN is not set

# CONFIG_HID_CHERRY is not set

# CONFIG_HID_CHICONY is not set

# CONFIG_HID_CYPRESS is not set

# CONFIG_HID_EZKEY is not set

# CONFIG_HID_GYRATION is not set

# CONFIG_HID_LOGITECH is not set

# CONFIG_HID_MICROSOFT is not set

# CONFIG_HID_MONTEREY is not set

# CONFIG_HID_NTRIG is not set

# CONFIG_HID_PANTHERLORD is not set

# CONFIG_HID_PETALYNX is not set

# CONFIG_HID_SAMSUNG is not set

# CONFIG_HID_SONY is not set

# CONFIG_HID_SUNPLUS is not set

# CONFIG_GREENASIA_FF is not set

# CONFIG_HID_TOPSEED is not set

# CONFIG_THRUSTMASTER_FF is not set

# CONFIG_ZEROPLUS_FF is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -898,7 +972,11 @@ CONFIG_USB_DEVICEFS=y 
# CONFIG_USB_DYNAMIC_MINORS is not set

CONFIG_USB_SUSPEND=y

# CONFIG_USB_OTG is not set

CONFIG_USB_MON=y

# CONFIG_USB_OTG_WHITELIST is not set

# CONFIG_USB_OTG_BLACKLIST_HUB is not set

CONFIG_USB_MON=m

# CONFIG_USB_WUSB is not set

# CONFIG_USB_WUSB_CBAF is not set



#

# USB Host Controller Drivers
@@ -909,6 +987,7 @@ CONFIG_USB_EHCI_HCD=m 
# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y

# CONFIG_USB_EHCI_HCD_PPC_OF is not set

# CONFIG_USB_OXU210HP_HCD is not set

# CONFIG_USB_ISP116X_HCD is not set

# CONFIG_USB_ISP1760_HCD is not set

CONFIG_USB_OHCI_HCD=m
@@ -918,6 +997,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y 
CONFIG_USB_OHCI_LITTLE_ENDIAN=y

# CONFIG_USB_SL811_HCD is not set

# CONFIG_USB_R8A66597_HCD is not set

# CONFIG_USB_HWA_HCD is not set



#

# Enable Host or Gadget support to see Inventra options
@@ -929,20 +1009,20 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
# CONFIG_USB_ACM is not set

# CONFIG_USB_PRINTER is not set

# CONFIG_USB_WDM is not set

# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

#



#

# may also be needed; see USB_STORAGE Help for more information

# see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=m

# CONFIG_USB_STORAGE_DEBUG is not set

# CONFIG_USB_STORAGE_DATAFAB is not set

# CONFIG_USB_STORAGE_FREECOM is not set

# CONFIG_USB_STORAGE_ISD200 is not set

# CONFIG_USB_STORAGE_DPCM is not set

# CONFIG_USB_STORAGE_USBAT is not set

# CONFIG_USB_STORAGE_SDDR09 is not set

# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -950,7 +1030,6 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set

# CONFIG_USB_STORAGE_KARMA is not set

# CONFIG_USB_STORAGE_SIERRA is not set

# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set

# CONFIG_USB_LIBUSUAL is not set
@@ -971,6 +1050,7 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_ADUTUX is not set

# CONFIG_USB_SEVSEG is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set
@@ -988,7 +1068,12 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

# CONFIG_USB_GADGET is not set



#

# OTG and related infrastructure

#

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set
@@ -1014,12 +1099,15 @@ CONFIG_RTC_INTF_DEV=y 
# Platform RTC drivers

#

# CONFIG_RTC_DRV_CMOS is not set

# CONFIG_RTC_DRV_DS1286 is not set

# CONFIG_RTC_DRV_DS1511 is not set

# CONFIG_RTC_DRV_DS1553 is not set

# CONFIG_RTC_DRV_DS1742 is not set

# CONFIG_RTC_DRV_STK17TA8 is not set

# CONFIG_RTC_DRV_M48T86 is not set

# CONFIG_RTC_DRV_M48T35 is not set

# CONFIG_RTC_DRV_M48T59 is not set

# CONFIG_RTC_DRV_BQ4802 is not set

# CONFIG_RTC_DRV_V3020 is not set



#
@@ -1028,6 +1116,7 @@ CONFIG_RTC_INTF_DEV=y 
CONFIG_RTC_DRV_PPC=m

# CONFIG_DMADEVICES is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set



#

# File systems
@@ -1035,26 +1124,35 @@ CONFIG_RTC_DRV_PPC=m 
CONFIG_EXT2_FS=m

# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS=m

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set

# CONFIG_EXT4DEV_FS is not set

CONFIG_JBD=y

CONFIG_EXT4_FS=y

# CONFIG_EXT4DEV_COMPAT is not set

CONFIG_EXT4_FS_XATTR=y

# CONFIG_EXT4_FS_POSIX_ACL is not set

# CONFIG_EXT4_FS_SECURITY is not set

CONFIG_JBD=m

# CONFIG_JBD_DEBUG is not set

CONFIG_JBD2=y

# CONFIG_JBD2_DEBUG is not set

CONFIG_FS_MBCACHE=y

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

CONFIG_QUOTA=y

# CONFIG_QUOTA_NETLINK_INTERFACE is not set

CONFIG_PRINT_QUOTA_WARNING=y

CONFIG_QUOTA_TREE=y

# CONFIG_QFMT_V1 is not set

CONFIG_QFMT_V2=y

CONFIG_QUOTACTL=y
@@ -1087,16 +1185,14 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 
CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems

#

CONFIG_MISC_FILESYSTEMS=y

# CONFIG_ADFS_FS is not set

# CONFIG_AFFS_FS is not set

# CONFIG_HFS_FS is not set
@@ -1106,6 +1202,7 @@ CONFIG_HUGETLB_PAGE=y 
# CONFIG_EFS_FS is not set

# CONFIG_JFFS2_FS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_OMFS_FS is not set
@@ -1126,6 +1223,7 @@ CONFIG_LOCKD_V4=y 
CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -1190,9 +1288,9 @@ CONFIG_NLS_ISO8859_1=y 
# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_GENERIC_FIND_FIRST_BIT is not set

CONFIG_GENERIC_FIND_LAST_BIT=y

CONFIG_CRC_CCITT=m

# CONFIG_CRC16 is not set

CONFIG_CRC16=y

CONFIG_CRC_T10DIF=y

CONFIG_CRC_ITU_T=m

CONFIG_CRC32=y
@@ -1250,27 +1348,44 @@ CONFIG_DEBUG_WRITECOUNT=y 
CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_LIST=y

# CONFIG_DEBUG_SG is not set

CONFIG_FRAME_POINTER=y

# CONFIG_DEBUG_NOTIFIERS is not set

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_HAVE_FTRACE=y

CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

# CONFIG_FTRACE is not set

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_RING_BUFFER=y

CONFIG_TRACING=y



#

# Tracers

#

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_FTRACE_STARTUP_TEST is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

CONFIG_PRINT_STACK_DEPTH=64

CONFIG_DEBUG_STACKOVERFLOW=y

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_CODE_PATCHING_SELFTEST is not set

# CONFIG_FTR_FIXUP_SELFTEST is not set

# CONFIG_MSI_BITMAP_SELFTEST is not set

# CONFIG_XMON is not set

CONFIG_IRQSTACKS=y

# CONFIG_VIRQ_DEBUG is not set
@@ -1282,16 +1397,26 @@ CONFIG_IRQSTACKS=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_CRYPTO=y



#

# Crypto core or helper

#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_ALGAPI2=y

CONFIG_CRYPTO_AEAD=m

CONFIG_CRYPTO_AEAD2=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_BLKCIPHER2=y

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG=m

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

CONFIG_CRYPTO_GF128MUL=m

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_CRYPTD is not set
@@ -1363,6 +1488,11 @@ CONFIG_CRYPTO_SALSA20=m 
#

# CONFIG_CRYPTO_DEFLATE is not set

CONFIG_CRYPTO_LZO=m



#

# Random Number Generation

#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

# CONFIG_PPC_CLOCK is not set

# CONFIG_VIRTUALIZATION is not set

arch/powerpc/include/asm/cputable.h

+3 −1
Original line number Diff line number Diff line
@@ -241,9 +241,11 @@ extern const char *powerpc_base_platform; 
/* We need to mark all pages as being coherent if we're SMP or we have a

 * 74[45]x and an MPC107 host bridge. Also 83xx and PowerQUICC II

 * require it for PCI "streaming/prefetch" to work properly.

 * This is also required by 52xx family.

 */

#if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) \

	|| defined(CONFIG_PPC_83xx) || defined(CONFIG_8260)

	|| defined(CONFIG_PPC_83xx) || defined(CONFIG_8260) \

	|| defined(CONFIG_PPC_MPC52xx)

#define CPU_FTR_COMMON                  CPU_FTR_NEED_COHERENT

#else

#define CPU_FTR_COMMON                  0

arch/powerpc/kernel/head_32.S

+3 −3
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ InstructionTLBMiss: 
	and	r1,r1,r2		/* writable if _RW and _DIRTY */

	rlwimi	r3,r3,32-1,30,30	/* _PAGE_USER -> PP msb */

	rlwimi	r3,r3,32-1,31,31	/* _PAGE_USER -> PP lsb */

	ori	r1,r1,0xe14		/* clear out reserved bits and M */

	ori	r1,r1,0xe04		/* clear out reserved bits */

	andc	r1,r3,r1		/* PP = user? (rw&dirty? 2: 3): 0 */

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_IMISS
@@ -585,7 +585,7 @@ DataLoadTLBMiss: 
	and	r1,r1,r2		/* writable if _RW and _DIRTY */

	rlwimi	r3,r3,32-1,30,30	/* _PAGE_USER -> PP msb */

	rlwimi	r3,r3,32-1,31,31	/* _PAGE_USER -> PP lsb */

	ori	r1,r1,0xe14		/* clear out reserved bits and M */

	ori	r1,r1,0xe04		/* clear out reserved bits */

	andc	r1,r3,r1		/* PP = user? (rw&dirty? 2: 3): 0 */

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_DMISS
@@ -653,7 +653,7 @@ DataStoreTLBMiss: 
	stw	r3,0(r2)		/* update PTE (accessed/dirty bits) */

	/* Convert linux-style PTE to low word of PPC-style PTE */

	rlwimi	r3,r3,32-1,30,30	/* _PAGE_USER -> PP msb */

	li	r1,0xe15		/* clear out reserved bits and M */

	li	r1,0xe05		/* clear out reserved bits & PP lsb */

	andc	r1,r3,r1		/* PP = user? 2: 0 */

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_DMISS

arch/powerpc/platforms/ps3/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -128,6 +128,13 @@ config PS3_FLASH 
	  be disabled on the kernel command line using "ps3flash=off", to

	  not allocate this fixed buffer.



config PS3_VRAM

	tristate "PS3 Video RAM Storage Driver"

	depends on FB_PS3=y && BLOCK && m

	help

	  This driver allows you to use excess PS3 video RAM as volatile

	  storage or system swap.



config PS3_LPM

	tristate "PS3 Logical Performance Monitor support"

	depends on PPC_PS3

drivers/block/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o 
obj-$(CONFIG_BLK_DEV_FD)	+= floppy.o

obj-$(CONFIG_AMIGA_FLOPPY)	+= amiflop.o

obj-$(CONFIG_PS3_DISK)		+= ps3disk.o

obj-$(CONFIG_PS3_VRAM)		+= ps3vram.o

obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o

obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o

obj-$(CONFIG_BLK_DEV_RAM)	+= brd.o