diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
tree | d535f46a917e14e90deccb29ad00aac016ad18dd /include/asm-x86/alternative-asm.h | |
parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'include/asm-x86/alternative-asm.h')
-rw-r--r-- | include/asm-x86/alternative-asm.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/asm-x86/alternative-asm.h b/include/asm-x86/alternative-asm.h deleted file mode 100644 index e2077d343c3..00000000000 --- a/include/asm-x86/alternative-asm.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifdef __ASSEMBLY__ - -#ifdef CONFIG_X86_32 -# define X86_ALIGN .long -#else -# define X86_ALIGN .quad -#endif - -#ifdef CONFIG_SMP - .macro LOCK_PREFIX -1: lock - .section .smp_locks,"a" - .align 4 - X86_ALIGN 1b - .previous - .endm -#else - .macro LOCK_PREFIX - .endm -#endif - -#endif /* __ASSEMBLY__ */ |