Commit 2e9e018e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: wire up new fanotify/prlimit64 syscalls
  ADI/ASoC: add MAINTAINERS entries
  Blackfin: fix hweight breakage
parents 6e0c64f4 f3411b16

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -454,6 +454,17 @@ L: linux-rdma@vger.kernel.org 
S:	Maintained

F:	drivers/infiniband/hw/amso1100/



ANALOG DEVICES INC ASOC DRIVERS

L:	uclinux-dist-devel@blackfin.uclinux.org

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

W:	http://blackfin.uclinux.org/

S:	Supported

F:	sound/soc/blackfin/*

F:	sound/soc/codecs/ad1*

F:	sound/soc/codecs/adau*

F:	sound/soc/codecs/adav*

F:	sound/soc/codecs/ssm*



AOA (Apple Onboard Audio) ALSA DRIVER

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linuxppc-dev@lists.ozlabs.org

arch/blackfin/include/asm/bitops.h

+10 −7
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ 


#include <asm-generic/bitops/sched.h>

#include <asm-generic/bitops/ffs.h>

#include <asm-generic/bitops/const_hweight.h>

#include <asm-generic/bitops/lock.h>



#include <asm-generic/bitops/ext2-non-atomic.h>

#include <asm-generic/bitops/ext2-atomic.h>

#include <asm-generic/bitops/minix.h>
@@ -115,7 +117,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) 
 * of bits set) of a N-bit word

 */



static inline unsigned int hweight32(unsigned int w)

static inline unsigned int __arch_hweight32(unsigned int w)

{

	unsigned int res;
@@ -125,19 +127,20 @@ static inline unsigned int hweight32(unsigned int w) 
	return res;

}



static inline unsigned int hweight64(__u64 w)

static inline unsigned int __arch_hweight64(__u64 w)

{

	return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);

	return __arch_hweight32((unsigned int)(w >> 32)) +

	       __arch_hweight32((unsigned int)w);

}



static inline unsigned int hweight16(unsigned int w)

static inline unsigned int __arch_hweight16(unsigned int w)

{

	return hweight32(w & 0xffff);

	return __arch_hweight32(w & 0xffff);

}



static inline unsigned int hweight8(unsigned int w)

static inline unsigned int __arch_hweight8(unsigned int w)

{

	return hweight32(w & 0xff);

	return __arch_hweight32(w & 0xff);

}



#endif				/* _BLACKFIN_BITOPS_H */

arch/blackfin/include/asm/unistd.h

+4 −1
Original line number Diff line number Diff line
@@ -389,8 +389,11 @@ 
#define __NR_rt_tgsigqueueinfo	368

#define __NR_perf_event_open	369

#define __NR_recvmmsg		370

#define __NR_fanotify_init	371

#define __NR_fanotify_mark	372

#define __NR_prlimit64		373



#define __NR_syscall		371

#define __NR_syscall		374

#define NR_syscalls		__NR_syscall



/* Old optional stuff no one actually uses */

arch/blackfin/mach-common/entry.S

+3 −0
Original line number Diff line number Diff line
@@ -1628,6 +1628,9 @@ ENTRY(_sys_call_table) 
	.long _sys_rt_tgsigqueueinfo

	.long _sys_perf_event_open

	.long _sys_recvmmsg		/* 370 */

	.long _sys_fanotify_init

	.long _sys_fanotify_mark

	.long _sys_prlimit64



	.rept NR_syscalls-(.-_sys_call_table)/4

	.long _sys_ni_syscall