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

Commit dd59f6c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: Convert BUG() to use unreachable()
  alpha: Add minimal support for software performance events
  alpha: Wire up missing/new syscalls
parents 70e66a50 acadbfb9

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config ALPHA 
	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_PERF_EVENTS

	help

	  The Alpha is a 64-bit general-purpose processor designed and

	  marketed by the Digital Equipment Corporation of blessed memory,

arch/alpha/include/asm/bug.h

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
		"call_pal %0  # bugchk\n\t"				\

		".long %1\n\t.8byte %2"					\

		: : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__));	\

	for ( ; ; ); } while (0)

	unreachable();							\

  } while (0)



#define HAVE_ARCH_BUG

#endif

arch/alpha/include/asm/perf_event.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ALPHA_PERF_EVENT_H

#define __ASM_ALPHA_PERF_EVENT_H



/* Alpha only supports software events through this interface. */

static inline void set_perf_event_pending(void) { }



#define PERF_EVENT_INDEX_OFFSET 0



#endif /* __ASM_ALPHA_PERF_EVENT_H */

arch/alpha/include/asm/unistd.h

+16 −1
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ 
#define __IGNORE_pause

#define __IGNORE_time

#define __IGNORE_utime

#define __IGNORE_umount2



/*

 * Linux-specific system calls begin at 300
@@ -434,10 +435,24 @@ 
#define __NR_timerfd			477

#define __NR_eventfd			478

#define __NR_recvmmsg			479

#define __NR_fallocate			480

#define __NR_timerfd_create		481

#define __NR_timerfd_settime		482

#define __NR_timerfd_gettime		483

#define __NR_signalfd4			484

#define __NR_eventfd2			485

#define __NR_epoll_create1		486

#define __NR_dup3			487

#define __NR_pipe2			488

#define __NR_inotify_init1		489

#define __NR_preadv			490

#define __NR_pwritev			491

#define __NR_rt_tgsigqueueinfo		492

#define __NR_perf_event_open		493



#ifdef __KERNEL__



#define NR_SYSCALLS			480

#define NR_SYSCALLS			494



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/alpha/kernel/systbls.S

+15 −1
Original line number Diff line number Diff line
@@ -495,9 +495,23 @@ sys_call_table: 
	.quad sys_epoll_pwait

	.quad sys_utimensat			/* 475 */

	.quad sys_signalfd

	.quad sys_ni_syscall

	.quad sys_ni_syscall			/* sys_timerfd */

	.quad sys_eventfd

	.quad sys_recvmmsg

	.quad sys_fallocate				/* 480 */

	.quad sys_timerfd_create

	.quad sys_timerfd_settime

	.quad sys_timerfd_gettime

	.quad sys_signalfd4

	.quad sys_eventfd2				/* 485 */

	.quad sys_epoll_create1

	.quad sys_dup3

	.quad sys_pipe2

	.quad sys_inotify_init1

	.quad sys_preadv				/* 490 */

	.quad sys_pwritev

	.quad sys_rt_tgsigqueueinfo

	.quad sys_perf_event_open



	.size sys_call_table, . - sys_call_table

	.type sys_call_table, @object