diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /include/linux/spinlock.h | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'include/linux/spinlock.h')
| -rw-r--r-- | include/linux/spinlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 89fac6a3f78b..f8854655860e 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
| @@ -60,7 +60,7 @@ | |||
| 60 | /* | 60 | /* |
| 61 | * Must define these before including other files, inline functions need them | 61 | * Must define these before including other files, inline functions need them |
| 62 | */ | 62 | */ |
| 63 | #define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME | 63 | #define LOCK_SECTION_NAME ".text..lock."KBUILD_BASENAME |
| 64 | 64 | ||
| 65 | #define LOCK_SECTION_START(extra) \ | 65 | #define LOCK_SECTION_START(extra) \ |
| 66 | ".subsection 1\n\t" \ | 66 | ".subsection 1\n\t" \ |