Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

generic-y += atomic.h

generic-y += auxvec.h

generic-y += barrier.h

generic-y += bitsperlong.h

generic-y += bugs.h

generic-y += cputime.h

/*

 *  Port on Texas Instruments TMS320C6x architecture

 *

 *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated

 *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  published by the Free Software Foundation.

 */

#ifndef _ASM_C6X_BARRIER_H

#define _ASM_C6X_BARRIER_H

#define nop()                    asm("NOP\n");

#define mb()                     barrier()

#define rmb()                    barrier()

#define wmb()                    barrier()

#define set_mb(var, value)       do { var = value;  mb(); } while (0)

#define set_wmb(var, value)      do { var = value; wmb(); } while (0)

#define smp_mb()	         barrier()

#define smp_rmb()	         barrier()

#define smp_wmb()	         barrier()

#define smp_read_barrier_depends()	do { } while (0)

#endif /* _ASM_C6X_BARRIER_H */

#define __NR_process_vm_writev 271

__SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \

          compat_sys_process_vm_writev)

#define __NR_kcmp 272

__SYSCALL(__NR_kcmp, sys_kcmp)

#undef __NR_syscalls

#define __NR_syscalls 272

#define __NR_syscalls 273

/*

 * All syscalls below here should go away really,