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

Commit 46fbdf89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  [Blackfin] arch: current_l1_stack_save is a pointer, so use NULL rather than 0
  [Blackfin] arch: fix atomic and32/xor32 comments and ENDPROC markings
  [Blackfin] arch: fix bug - allow SDH driver to be used as module
  [Blackfin] arch: to kill syscalls missing warning by adding new timerfd syscalls
parents a0863130 9821b1f4

arch/blackfin/kernel/fixed_code.S

+6 −6
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ ENDPROC (_atomic_ior32) 


.align 16

	/*

	 * Atomic ior, 32 bit.

	 * Atomic and, 32 bit.

	 * Inputs:	P0: memory address to use

	 *		R0: value to ior

	 *		R0: value to and

	 * Outputs:	R0: new contents of the memory address.

	 *		R1: previous contents of the memory address.

	 */
@@ -112,13 +112,13 @@ ENTRY(_atomic_and32) 
	R0 = R1 & R0;

	[P0] = R0;

	rts;

ENDPROC (_atomic_ior32)

ENDPROC (_atomic_and32)



.align 16

	/*

	 * Atomic ior, 32 bit.

	 * Atomic xor, 32 bit.

	 * Inputs:	P0: memory address to use

	 *		R0: value to ior

	 *		R0: value to xor

	 * Outputs:	R0: new contents of the memory address.

	 *		R1: previous contents of the memory address.

	 */
@@ -127,7 +127,7 @@ ENTRY(_atomic_xor32) 
	R0 = R1 ^ R0;

	[P0] = R0;

	rts;

ENDPROC (_atomic_ior32)

ENDPROC (_atomic_xor32)



.align 16

	/*

arch/blackfin/mach-bf548/boards/ezkit.c

+2 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static struct platform_device bf5xx_nand_device = { 
};

#endif



#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN)

#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)

static struct platform_device bf54x_sdh_device = {

	.name = "bfin-sdh",

	.id = 0,
@@ -636,7 +636,7 @@ static struct platform_device *ezkit_devices[] __initdata = { 
	&bf5xx_nand_device,

#endif



#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN)

#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)

	&bf54x_sdh_device,

#endif

arch/blackfin/mach-common/entry.S

+4 −1
Original line number Diff line number Diff line
@@ -1369,7 +1369,7 @@ ENTRY(_sys_call_table) 
	.long _sys_epoll_pwait

	.long _sys_utimensat

	.long _sys_signalfd

	.long _sys_ni_syscall

	.long _sys_timerfd_create

	.long _sys_eventfd	/* 350 */

	.long _sys_pread64

	.long _sys_pwrite64
@@ -1378,6 +1378,9 @@ ENTRY(_sys_call_table) 
	.long _sys_get_robust_list	/* 355 */

	.long _sys_fallocate

	.long _sys_semtimedop

	.long _sys_timerfd_settime

	.long _sys_timerfd_gettime



	.rept NR_syscalls-(.-_sys_call_table)/4

	.long _sys_ni_syscall

	.endr

include/asm-blackfin/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static inline void destroy_context(struct mm_struct *mm) 
	struct sram_list_struct *tmp;



	if (current_l1_stack_save == mm->context.l1_stack_save)

		current_l1_stack_save = 0;

		current_l1_stack_save = NULL;

	if (mm->context.l1_stack_save)

		free_l1stack();

include/asm-blackfin/unistd.h

+4 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ 
#define __NR_epoll_pwait	346

#define __NR_utimensat		347

#define __NR_signalfd		348

#define __NR_timerfd		349

#define __NR_timerfd_create	349

#define __NR_eventfd		350

#define __NR_pread64		351

#define __NR_pwrite64		352
@@ -370,8 +370,10 @@ 
#define __NR_get_robust_list	355

#define __NR_fallocate		356

#define __NR_semtimedop		357

#define __NR_timerfd_settime	358

#define __NR_timerfd_gettime	359



#define __NR_syscall		358

#define __NR_syscall		360

#define NR_syscalls		__NR_syscall



/* Old optional stuff no one actually uses */