lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/mm' into core/percpu

Browse Source 
Conflicts:
	arch/x86/mm/fault.c
This commit is contained in:
Ingo Molnar
2009-01-21 10:39:51 +01:00
parent 4ec71fa2d2 92181f190b
commit 198030782c
527 changed files with 8252 additions and 3743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/calls.S
View File

@ -98,7 +98,7 @@
CALL(sys_uselib)
CALL(sys_swapon)
CALL(sys_reboot)
CALL(OBSOLETE(old_readdir)) /* used by libc4 */
CALL(OBSOLETE(sys_old_readdir)) /* used by libc4 */
/* 90 */ CALL(OBSOLETE(old_mmap)) /* used by libc4 */
CALL(sys_munmap)
CALL(sys_truncate)