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

Commit 7f0d32e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-3.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze updates from Michal Simek:
 - add new syscall and fix comment
 - fix udelay implementation
 - fix libgcc for modules

* tag 'microblaze-3.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Change libgcc-style functions from lib-y to obj-y
  microblaze: Wire-up renameat2 syscall
  microblaze: Add syscall number comment
  microblaze: delay.h fix udelay and ndelay for 8 bit args
parents 8b076738 ef264cf0

arch/microblaze/include/asm/delay.h

+22 −6
Original line number Diff line number Diff line
@@ -61,13 +61,29 @@ extern inline void __udelay(unsigned int x) 
extern void __bad_udelay(void);		/* deliberately undefined */

extern void __bad_ndelay(void);		/* deliberately undefined */



#define udelay(n) (__builtin_constant_p(n) ? \

	((n) > __MAX_UDELAY ? __bad_udelay() : __udelay((n) * (19 * HZ))) : \

	__udelay((n) * (19 * HZ)))

#define udelay(n)						\

	({							\

		if (__builtin_constant_p(n)) {			\

			if ((n) / __MAX_UDELAY >= 1)		\

				__bad_udelay();			\

			else					\

				__udelay((n) * (19 * HZ));	\

		} else {					\

			__udelay((n) * (19 * HZ));		\

		}						\

	})



#define ndelay(n) (__builtin_constant_p(n) ? \

	((n) > __MAX_NDELAY ? __bad_ndelay() : __udelay((n) * HZ)) : \

	__udelay((n) * HZ))

#define ndelay(n)						\

	({							\

		if (__builtin_constant_p(n)) {			\

			if ((n) / __MAX_NDELAY >= 1)		\

				__bad_ndelay();			\

			else					\

				__udelay((n) * HZ);		\

		} else {					\

			__udelay((n) * HZ);			\

		}						\

	})



#define muldiv(a, b, c)		(((a)*(b))/(c))

arch/microblaze/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -398,5 +398,6 @@ 
#define __NR_finit_module	380

#define __NR_sched_setattr	381

#define __NR_sched_getattr	382

#define __NR_renameat2		383



#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */

arch/microblaze/kernel/syscall_table.S

+2 −1
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ ENTRY(sys_call_table) 
	.long sys_process_vm_readv

	.long sys_process_vm_writev

	.long sys_kcmp

	.long sys_finit_module

	.long sys_finit_module		/* 380 */

	.long sys_sched_setattr

	.long sys_sched_getattr

	.long sys_renameat2

arch/microblaze/lib/Makefile

+3 −11
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ endif 


lib-y += uaccess_old.o



lib-y += ashldi3.o

lib-y += ashrdi3.o

lib-y += cmpdi2.o

lib-y += divsi3.o

lib-y += lshrdi3.o

lib-y += modsi3.o

lib-y += muldi3.o

lib-y += mulsi3.o

lib-y += ucmpdi2.o

lib-y += udivsi3.o

lib-y += umodsi3.o
 
# libgcc-style stuff needed in the kernel

obj-y += ashldi3.o ashrdi3.o cmpdi2.o divsi3.o lshrdi3.o modsi3.o

obj-y += muldi3.o mulsi3.o ucmpdi2.o udivsi3.o umodsi3.o