Commit 4d70230b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'master' of... 

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into perf/urgent
parents 98bb3188 bfd412db

Documentation/flexible-arrays.txt

+2 −2
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ trick is to ensure that any needed memory allocations are done before 
entering atomic context, using:



    int flex_array_prealloc(struct flex_array *array, unsigned int start,

			    unsigned int end, gfp_t flags);

			    unsigned int nr_elements, gfp_t flags);



This function will ensure that memory for the elements indexed in the range

defined by start and end has been allocated.  Thereafter, a

defined by start and nr_elements has been allocated.  Thereafter, a

flex_array_put() call on an element in that range is guaranteed not to

block.

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 39

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*

arch/arm/configs/at91x40_defconfig

0 → 100644
+48 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EMBEDDED=y

# CONFIG_HOTPLUG is not set

# CONFIG_ELF_CORE is not set

# CONFIG_FUTEX is not set

# CONFIG_TIMERFD is not set

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91X40=y

CONFIG_MACH_AT91EB01=y

CONFIG_AT91_EARLY_USART0=y

CONFIG_CPU_ARM7TDMI=y

CONFIG_SET_MEM_PARAM=y

CONFIG_DRAM_BASE=0x01000000

CONFIG_DRAM_SIZE=0x00400000

CONFIG_FLASH_MEM_BASE=0x01400000

CONFIG_PROCESSOR_ID=0x14000040

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_BINFMT_FLAT=y

# CONFIG_SUSPEND is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_DEVKMEM is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_ROMFS_FS=y

# CONFIG_ENABLE_MUST_CHECK is not set

arch/arm/mach-at91/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ config ARCH_AT91CAP9 
	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB



config ARCH_AT572D940HF

	bool "AT572D940HF"

arch/arm/mach-at91/board-eb01.c

+6 −1
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ 
#include <mach/board.h>

#include "generic.h"



static void __init at91eb01_init_irq(void)

{

	at91x40_init_interrupts(NULL);

}



static void __init at91eb01_map_io(void)

{

	at91x40_initialize(40000000);
@@ -38,7 +43,7 @@ static void __init at91eb01_map_io(void) 
MACHINE_START(AT91EB01, "Atmel AT91 EB01")

	/* Maintainer: Greg Ungerer <gerg@snapgear.com> */

	.timer		= &at91x40_timer,

	.init_irq	= at91x40_init_interrupts,

	.init_irq	= at91eb01_init_irq,

	.map_io		= at91eb01_map_io,

MACHINE_END