Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin

	depends on SMP && HOTPLUG

	default y

config HAVE_LEGACY_PER_CPU_AREA

	def_bool y

	depends on SMP

config BF_REV_MIN

	int

	default 0 if (BF51x || BF52x || (BF54x && !BF54xM))

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EXPERT=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_ELF_CORE is not set

CONFIG_EBIU_FCTLVAL=0x6

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_CAN=m

CONFIG_CAN_RAW=m

CONFIG_CAN_BCM=m

CONFIG_CAN_DEV=m

CONFIG_CAN_BFIN=m

CONFIG_IRDA=m

CONFIG_IRLAN=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_FW_LOADER=m

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_TOUCHSCREEN_AD7877=m

CONFIG_INPUT_MISC=y

# CONFIG_SERIO is not set

# CONFIG_DEVKMEM is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_BFIN_JTAG_COMM=m

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_BFIN=y

CONFIG_SERIAL_BFIN_CONSOLE=y

CONFIG_SERIAL_BFIN_UART1=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_USB_OTG_BLACKLIST_HUB=y

CONFIG_USB_MON=y

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_MUSB_BLACKFIN=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK=m

CONFIG_NFS_V3=y

CONFIG_NFSD=m

CONFIG_NFSD_V3=y

CONFIG_SMB_FS=m

CONFIG_SMB_NLS_DEFAULT=y

CONFIG_CIFS=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_CODEPAGE_936=m

CONFIG_DEBUG_SHIRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_MMRS=y

CONFIG_DEBUG_HWERR=y

CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_BFIN_PSEUDODBG_INSNS=y

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

generic-y += local.h

generic-y += mman.h

generic-y += msgbuf.h

generic-y += mutex.h

generic-y += param.h

generic-y += percpu.h

generic-y += pgalloc.h

/*

 * Copyright 2004-2009 Analog Devices Inc.

 * Copyright 2004-2011 Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later.

 */

#ifndef __ARCH_BLACKFIN_ATOMIC__

#define __ARCH_BLACKFIN_ATOMIC__

#ifndef CONFIG_SMP

# include <asm-generic/atomic.h>

#else

#include <linux/types.h>

#include <asm/system.h>	/* local_irq_XXX() */

/*

 * Atomic operations that C can't guarantee us.  Useful for

 * resource counting etc..

 */

#define ATOMIC_INIT(i)	{ (i) }

#define atomic_set(v, i)	(((v)->counter) = i)

#ifdef CONFIG_SMP

#define atomic_read(v)	__raw_uncached_fetch_asm(&(v)->counter)

#include <linux/linkage.h>

asmlinkage int __raw_uncached_fetch_asm(const volatile int *ptr);

asmlinkage int __raw_atomic_update_asm(volatile int *ptr, int value);

asmlinkage int __raw_atomic_clear_asm(volatile int *ptr, int value);

asmlinkage int __raw_atomic_set_asm(volatile int *ptr, int value);

asmlinkage int __raw_atomic_xor_asm(volatile int *ptr, int value);

asmlinkage int __raw_atomic_test_asm(const volatile int *ptr, int value);

static inline void atomic_add(int i, atomic_t *v)

{

	__raw_atomic_update_asm(&v->counter, i);

}

static inline void atomic_sub(int i, atomic_t *v)

{

	__raw_atomic_update_asm(&v->counter, -i);

}

static inline int atomic_add_return(int i, atomic_t *v)

{

	return __raw_atomic_update_asm(&v->counter, i);

}

static inline int atomic_sub_return(int i, atomic_t *v)

{

	return __raw_atomic_update_asm(&v->counter, -i);

}

static inline void atomic_inc(volatile atomic_t *v)

{

	__raw_atomic_update_asm(&v->counter, 1);

}

static inline void atomic_dec(volatile atomic_t *v)

{

	__raw_atomic_update_asm(&v->counter, -1);

}

static inline void atomic_clear_mask(int mask, atomic_t *v)

{

	__raw_atomic_clear_asm(&v->counter, mask);

}

static inline void atomic_set_mask(int mask, atomic_t *v)

{

	__raw_atomic_set_asm(&v->counter, mask);

}

/* Atomic operations are already serializing */

#define smp_mb__before_atomic_dec()    barrier()

#define smp_mb__after_atomic_dec() barrier()

#define smp_mb__before_atomic_inc()    barrier()

#define smp_mb__after_atomic_inc() barrier()

#define atomic_add_negative(a, v)	(atomic_add_return((a), (v)) < 0)

#define atomic_dec_return(v) atomic_sub_return(1,(v))

#define atomic_inc_return(v) atomic_add_return(1,(v))

#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))

#define atomic_xchg(v, new) (xchg(&((v)->counter), new))

#define __atomic_add_unless(v, a, u)				\

({								\

	int c, old;						\

	c = atomic_read(v);					\

	while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \

		c = old;					\

	c;							\

})

/*

 * atomic_inc_and_test - increment and test

 * @v: pointer of type atomic_t

 *

 * Atomically increments @v by 1

 * and returns true if the result is zero, or false for all

 * other cases.

 */

#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)

#define atomic_read(v) __raw_uncached_fetch_asm(&(v)->counter)

#define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0)

#define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0)

#define atomic_add_return(i, v) __raw_atomic_update_asm(&(v)->counter, i)

#define atomic_sub_return(i, v) __raw_atomic_update_asm(&(v)->counter, -(i))

#define atomic_clear_mask(m, v) __raw_atomic_clear_asm(&(v)->counter, m)

#define atomic_set_mask(m, v)   __raw_atomic_set_asm(&(v)->counter, m)

#endif

#include <asm-generic/atomic.h>

#endif

#include <asm-generic/mutex-dec.h>