apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

Browse Source 
Conflicts:
	include/asm-x86/dma-mapping.h
	include/asm-x86/gpio.h
	include/asm-x86/idle.h
	include/asm-x86/kvm_host.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2008-10-06 16:15:57 +02:00
parent fec6ed1d1f 1503af6619
commit b8cd9d056b
285 changed files with 849 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/asm-x86/mman.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef _ASM_X86_MMAN_H
#define _ASM_X86_MMAN_H
#ifndef ASM_X86__MMAN_H
#define ASM_X86__MMAN_H
#include <asm-generic/mman.h>
@@ -17,4 +17,4 @@
#define MCL_CURRENT 1 /* lock all current mappings */
#define MCL_FUTURE 2 /* lock all future mappings */
#endif /* _ASM_X86_MMAN_H */
#endif /* ASM_X86__MMAN_H */