diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 11:41:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 11:41:43 -0400 |
| commit | 1dc60c53d36b08f361e1a2767c41196acce96d08 (patch) | |
| tree | 35966ad2c2465e6f722d199e4b1799fb4c6f2b46 /include | |
| parent | 8d2567a620ae8c24968a2bdc1c906c724fac1f6a (diff) | |
| parent | 3f1c38723eb467d34d704d0ee6e7b796ba4981ee (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix compile error with CONFIG_AS_CFI=n
Documentation: document debugpat commandline option
x86: sanitize Kconfig
x86, suspend, acpi: correct and add comments about Big Real Mode
x86, suspend, acpi: enter Big Real Mode
Fixed trivial conflict in include/asm-x86/dwarf2.h due to just using
different names for "cfi_ignore" (vs "__cfi_ignore") macro.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/dwarf2.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h index fd4a6a0393ac..738bb9fb3e53 100644 --- a/include/asm-x86/dwarf2.h +++ b/include/asm-x86/dwarf2.h | |||
| @@ -38,23 +38,23 @@ | |||
| 38 | 38 | ||
| 39 | /* Due to the structure of pre-exisiting code, don't use assembler line | 39 | /* Due to the structure of pre-exisiting code, don't use assembler line |
| 40 | comment character # to ignore the arguments. Instead, use a dummy macro. */ | 40 | comment character # to ignore the arguments. Instead, use a dummy macro. */ |
| 41 | .macro __cfi_ignore a=0, b=0, c=0, d=0 | 41 | .macro cfi_ignore a=0, b=0, c=0, d=0 |
| 42 | .endm | 42 | .endm |
| 43 | 43 | ||
| 44 | #define CFI_STARTPROC __cfi_ignore | 44 | #define CFI_STARTPROC cfi_ignore |
| 45 | #define CFI_ENDPROC __cfi_ignore | 45 | #define CFI_ENDPROC cfi_ignore |
| 46 | #define CFI_DEF_CFA __cfi_ignore | 46 | #define CFI_DEF_CFA cfi_ignore |
| 47 | #define CFI_DEF_CFA_REGISTER __cfi_ignore | 47 | #define CFI_DEF_CFA_REGISTER cfi_ignore |
| 48 | #define CFI_DEF_CFA_OFFSET __cfi_ignore | 48 | #define CFI_DEF_CFA_OFFSET cfi_ignore |
| 49 | #define CFI_ADJUST_CFA_OFFSET __cfi_ignore | 49 | #define CFI_ADJUST_CFA_OFFSET cfi_ignore |
| 50 | #define CFI_OFFSET __cfi_ignore | 50 | #define CFI_OFFSET cfi_ignore |
| 51 | #define CFI_REL_OFFSET __cfi_ignore | 51 | #define CFI_REL_OFFSET cfi_ignore |
| 52 | #define CFI_REGISTER __cfi_ignore | 52 | #define CFI_REGISTER cfi_ignore |
| 53 | #define CFI_RESTORE __cfi_ignore | 53 | #define CFI_RESTORE cfi_ignore |
| 54 | #define CFI_REMEMBER_STATE __cfi_ignore | 54 | #define CFI_REMEMBER_STATE cfi_ignore |
| 55 | #define CFI_RESTORE_STATE __cfi_ignore | 55 | #define CFI_RESTORE_STATE cfi_ignore |
| 56 | #define CFI_UNDEFINED __cfi_ignore | 56 | #define CFI_UNDEFINED cfi_ignore |
| 57 | #define CFI_SIGNAL_FRAME __cfi_ignore | 57 | #define CFI_SIGNAL_FRAME cfi_ignore |
| 58 | 58 | ||
| 59 | #endif | 59 | #endif |
| 60 | 60 | ||