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

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6881/1: cputype.h uses __attribute_const__ which requires including kernel.h
  ARM: Add new syscalls
parents 8653b3f1 e9569c15

arch/arm/include/asm/cputype.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __ASM_ARM_CPUTYPE_H



#include <linux/stringify.h>

#include <linux/kernel.h>



#define CPUID_ID	0

#define CPUID_CACHETYPE	1

arch/arm/include/asm/unistd.h

+4 −0
Original line number Diff line number Diff line
@@ -396,6 +396,10 @@ 
#define __NR_fanotify_init		(__NR_SYSCALL_BASE+367)

#define __NR_fanotify_mark		(__NR_SYSCALL_BASE+368)

#define __NR_prlimit64			(__NR_SYSCALL_BASE+369)

#define __NR_name_to_handle_at		(__NR_SYSCALL_BASE+370)

#define __NR_open_by_handle_at		(__NR_SYSCALL_BASE+371)

#define __NR_clock_adjtime		(__NR_SYSCALL_BASE+372)

#define __NR_syncfs			(__NR_SYSCALL_BASE+373)



/*

 * The following SWIs are ARM private.

arch/arm/kernel/calls.S

+4 −0
Original line number Diff line number Diff line
@@ -379,6 +379,10 @@ 
		CALL(sys_fanotify_init)

		CALL(sys_fanotify_mark)

		CALL(sys_prlimit64)

/* 370 */	CALL(sys_name_to_handle_at)

		CALL(sys_open_by_handle_at)

		CALL(sys_clock_adjtime)

		CALL(sys_syncfs)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted