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

Commit 3ca50496 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.34-rc6' into perf/core 



Merge reason: update to the latest -rc.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 462b04e2 66f41d4c

Documentation/cgroups/cgroups.txt

+1 −2
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ containing the following files describing that cgroup: 
 - cgroup.procs: list of tgids in the cgroup.  This list is not

   guaranteed to be sorted or free of duplicate tgids, and userspace

   should sort/uniquify the list if this property is required.

   Writing a tgid into this file moves all threads with that tgid into

   this cgroup.

   This is a read-only file, for now.

 - notify_on_release flag: run the release agent on exit?

 - release_agent: the path to use for release notifications (this file

   exists in the top cgroup only)

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -4482,17 +4482,17 @@ S: Maintained 
F:	drivers/ata/sata_promise.*



PS3 NETWORK SUPPORT

M:	Geoff Levand <geoffrey.levand@am.sony.com>

M:	Geoff Levand <geoff@infradead.org>

L:	netdev@vger.kernel.org

L:	cbe-oss-dev@ozlabs.org

S:	Supported

S:	Maintained

F:	drivers/net/ps3_gelic_net.*



PS3 PLATFORM SUPPORT

M:	Geoff Levand <geoffrey.levand@am.sony.com>

M:	Geoff Levand <geoff@infradead.org>

L:	linuxppc-dev@ozlabs.org

L:	cbe-oss-dev@ozlabs.org

S:	Supported

S:	Maintained

F:	arch/powerpc/boot/ps3*

F:	arch/powerpc/include/asm/lv1call.h

F:	arch/powerpc/include/asm/ps3*.h

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 34

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Sheep on Meth



# *DOCUMENTATION*

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ config ARCH_REALVIEW 
	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select GPIO_PL061 if GPIOLIB

	help

	  This enables support for ARM Ltd RealView boards.

arch/arm/configs/bcmring_defconfig

+101 −25
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.31-rc3

# Fri Jul 17 12:07:28 2009

# Linux kernel version: 2.6.34-rc2

# Mon Mar 29 12:01:41 2010

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

CONFIG_HAVE_PROC_CPU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,6 +18,7 @@ CONFIG_GENERIC_IRQ_PROBE=y 
CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_NEED_DMA_MAP_STATE=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -32,6 +33,12 @@ CONFIG_LOCK_KERNEL=y 
CONFIG_INIT_ENV_ARG_LIMIT=32

CONFIG_LOCALVERSION=""

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_HAVE_KERNEL_GZIP=y

CONFIG_HAVE_KERNEL_LZO=y

CONFIG_KERNEL_GZIP=y

# CONFIG_KERNEL_BZIP2 is not set

# CONFIG_KERNEL_LZMA is not set

# CONFIG_KERNEL_LZO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC_SYSCTL=y
@@ -43,21 +50,22 @@ CONFIG_SYSVIPC_SYSCTL=y 
#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_TINY_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=32

# CONFIG_RCU_FANOUT_EXACT 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_GROUP_SCHED is not set

# CONFIG_CGROUPS is not set

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y

CONFIG_EMBEDDED=y

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y
@@ -75,19 +83,21 @@ CONFIG_FUTEX=y 
# CONFIG_EVENTFD is not set

CONFIG_SHMEM=y

# CONFIG_AIO is not set

CONFIG_HAVE_PERF_EVENTS=y

CONFIG_PERF_USE_VMALLOC=y



#

# Performance Counters

# Kernel Performance Events And Counters

#

CONFIG_PERF_EVENTS=y

CONFIG_PERF_COUNTERS=y

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_SLUB_DEBUG is not set

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_COMPAT_BRK is not set

# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y
@@ -115,24 +125,53 @@ CONFIG_LBDAF=y 
# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

# CONFIG_IOSCHED_AS is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_DEFAULT_AS is not set

# CONFIG_DEFAULT_DEADLINE is not set

# CONFIG_DEFAULT_CFQ is not set

CONFIG_DEFAULT_NOOP=y

CONFIG_DEFAULT_IOSCHED="noop"

# CONFIG_INLINE_SPIN_TRYLOCK is not set

# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK is not set

# CONFIG_INLINE_SPIN_LOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK_IRQ is not set

# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set

# CONFIG_INLINE_SPIN_UNLOCK is not set

# CONFIG_INLINE_SPIN_UNLOCK_BH is not set

# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set

# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_READ_TRYLOCK is not set

# CONFIG_INLINE_READ_LOCK is not set

# CONFIG_INLINE_READ_LOCK_BH is not set

# CONFIG_INLINE_READ_LOCK_IRQ is not set

# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set

# CONFIG_INLINE_READ_UNLOCK is not set

# CONFIG_INLINE_READ_UNLOCK_BH is not set

# CONFIG_INLINE_READ_UNLOCK_IRQ is not set

# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_WRITE_TRYLOCK is not set

# CONFIG_INLINE_WRITE_LOCK is not set

# CONFIG_INLINE_WRITE_LOCK_BH is not set

# CONFIG_INLINE_WRITE_LOCK_IRQ is not set

# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set

# CONFIG_INLINE_WRITE_UNLOCK is not set

# CONFIG_INLINE_WRITE_UNLOCK_BH is not set

# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set

# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set

# CONFIG_MUTEX_SPIN_ON_OWNER is not set

# CONFIG_FREEZER is not set



#

# System Type

#

CONFIG_MMU=y

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

CONFIG_ARCH_BCMRING=y

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set
@@ -149,6 +188,7 @@ CONFIG_DEFAULT_IOSCHED="noop" 
# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_DOVE is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set
@@ -157,19 +197,26 @@ CONFIG_DEFAULT_IOSCHED="noop" 
# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_NUC93X is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_SHMOBILE is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_S5P6440 is not set

# CONFIG_ARCH_S5P6442 is not set

# CONFIG_ARCH_S5PC1XX is not set

# CONFIG_ARCH_S5PV210 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_U300 is not set

# CONFIG_ARCH_U8500 is not set

# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

CONFIG_ARCH_BCMRING=y

# CONFIG_ARCH_FPGA11107 is not set

CONFIG_ARCH_BCM11107=y
@@ -185,7 +232,7 @@ CONFIG_CPU_V6=y 
CONFIG_CPU_32v6K=y

CONFIG_CPU_32v6=y

CONFIG_CPU_ABRT_EV6=y

CONFIG_CPU_PABRT_NOIFAR=y

CONFIG_CPU_PABRT_V6=y

CONFIG_CPU_CACHE_V6=y

CONFIG_CPU_CACHE_VIPT=y

CONFIG_CPU_COPY_V6=y
@@ -201,6 +248,8 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_ICACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_CPU_HAS_PMU=y

# CONFIG_ARM_ERRATA_411920 is not set

CONFIG_COMMON_CLKDEV=y
@@ -222,6 +271,8 @@ CONFIG_VMSPLIT_3G=y 
# CONFIG_VMSPLIT_2G is not set

# CONFIG_VMSPLIT_1G is not set

CONFIG_PAGE_OFFSET=0xC0000000

# CONFIG_PREEMPT_NONE is not set

# CONFIG_PREEMPT_VOLUNTARY is not set

CONFIG_PREEMPT=y

CONFIG_HZ=100

CONFIG_AEABI=y
@@ -229,6 +280,7 @@ CONFIG_AEABI=y 
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set

# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

# CONFIG_HIGHMEM is not set

CONFIG_HW_PERF_EVENTS=y

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -240,8 +292,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 
# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_ALIGNMENT_TRAP=y

CONFIG_UACCESS_WITH_MEMCPY=y
@@ -335,9 +386,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
# CONFIG_CONNECTOR is not set

CONFIG_MTD=y

# CONFIG_MTD_DEBUG is not set

# CONFIG_MTD_TESTS is not set

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_AFS_PARTS is not set
@@ -433,6 +484,10 @@ CONFIG_MTD_NAND_BCM_UMI_HWCS=y 
CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_COW_COMMON is not set

# CONFIG_BLK_DEV_LOOP is not set



#

# DRBD disabled because PROC_FS, INET or CONNECTOR not selected

#

# CONFIG_BLK_DEV_NBD is not set

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_CDROM_PKTCDVD is not set
@@ -444,6 +499,7 @@ CONFIG_HAVE_IDE=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_DMA is not set
@@ -452,6 +508,7 @@ CONFIG_HAVE_IDE=y 
# CONFIG_MD is not set

# CONFIG_NETDEVICES is not set

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set



#

# Input device support
@@ -459,6 +516,7 @@ CONFIG_HAVE_IDE=y 
CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set

# CONFIG_INPUT_SPARSEKMAP is not set



#

# Userland interfaces
@@ -508,6 +566,7 @@ CONFIG_SERIAL_AMBA_PL011=y 
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_TIMBERDALE is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -519,13 +578,17 @@ CONFIG_LEGACY_PTY_COUNT=64 
# CONFIG_TCG_TPM is not set

# CONFIG_I2C is not set

# CONFIG_SPI is not set



#

# PPS support

#

# CONFIG_PPS is not set

CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y

# CONFIG_GPIOLIB is not set

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

CONFIG_SSB_POSSIBLE=y
@@ -541,6 +604,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

# CONFIG_MEDIA_SUPPORT is not set



#
@@ -566,14 +630,17 @@ CONFIG_DUMMY_CONSOLE=y 
# CONFIG_USB_SUPPORT is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_ACCESSIBILITY is not set

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_REGULATOR is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -589,9 +656,12 @@ CONFIG_FS_POSIX_ACL=y 
# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

# CONFIG_NILFS2_FS is not set

# CONFIG_FILE_LOCKING is not set

# CONFIG_FSNOTIFY is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY is not set

# CONFIG_INOTIFY_USER is not set

# CONFIG_QUOTA is not set

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set
@@ -647,6 +717,7 @@ CONFIG_JFFS2_ZLIB=y 
# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

# CONFIG_LOGFS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -657,7 +728,6 @@ CONFIG_JFFS2_RTIME=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set



#
@@ -675,11 +745,12 @@ CONFIG_MSDOS_PARTITION=y 
CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=1024

CONFIG_MAGIC_SYSRQ=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

CONFIG_HEADERS_CHECK=y

# CONFIG_DEBUG_KERNEL is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_MEMORY_INIT is not set

CONFIG_FRAME_POINTER=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -693,6 +764,7 @@ CONFIG_TRACING_SUPPORT=y 
CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_ARM_UNWIND is not set

# CONFIG_DEBUG_USER is not set

# CONFIG_OC_ETM is not set



#

# Security options
@@ -700,7 +772,11 @@ CONFIG_HAVE_ARCH_KGDB=y 
# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_DEFAULT_SECURITY_SELINUX is not set

# CONFIG_DEFAULT_SECURITY_SMACK is not set

# CONFIG_DEFAULT_SECURITY_TOMOYO is not set

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_DEFAULT_SECURITY=""

# CONFIG_CRYPTO is not set

# CONFIG_BINARY_PRINTF is not set