diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /include/asm-x86/mutex_32.h | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'include/asm-x86/mutex_32.h')
| -rw-r--r-- | include/asm-x86/mutex_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mutex_32.h b/include/asm-x86/mutex_32.h index 73e928ef5f03..25c16d8ba3c7 100644 --- a/include/asm-x86/mutex_32.h +++ b/include/asm-x86/mutex_32.h | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> | 7 | * Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> |
| 8 | */ | 8 | */ |
| 9 | #ifndef _ASM_MUTEX_H | 9 | #ifndef ASM_X86__MUTEX_32_H |
| 10 | #define _ASM_MUTEX_H | 10 | #define ASM_X86__MUTEX_32_H |
| 11 | 11 | ||
| 12 | #include <asm/alternative.h> | 12 | #include <asm/alternative.h> |
| 13 | 13 | ||
| @@ -122,4 +122,4 @@ static inline int __mutex_fastpath_trylock(atomic_t *count, | |||
| 122 | #endif | 122 | #endif |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | #endif | 125 | #endif /* ASM_X86__MUTEX_32_H */ |