diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
| commit | 29308333fbe2cc61258c1c470f9403960428beb2 (patch) | |
| tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/paravirt.h | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/paravirt.h')
| -rw-r--r-- | include/asm-x86/paravirt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index fbbde93f12d6..2e6821a0b6e7 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __ASM_PARAVIRT_H | 1 | #ifndef ASM_X86__PARAVIRT_H |
| 2 | #define __ASM_PARAVIRT_H | 2 | #define ASM_X86__PARAVIRT_H |
| 3 | /* Various instructions on x86 need to be replaced for | 3 | /* Various instructions on x86 need to be replaced for |
| 4 | * para-virtualization: those hooks are defined here. */ | 4 | * para-virtualization: those hooks are defined here. */ |
| 5 | 5 | ||
| @@ -1634,4 +1634,4 @@ static inline unsigned long __raw_local_irq_save(void) | |||
| 1634 | 1634 | ||
| 1635 | #endif /* __ASSEMBLY__ */ | 1635 | #endif /* __ASSEMBLY__ */ |
| 1636 | #endif /* CONFIG_PARAVIRT */ | 1636 | #endif /* CONFIG_PARAVIRT */ |
| 1637 | #endif /* __ASM_PARAVIRT_H */ | 1637 | #endif /* ASM_X86__PARAVIRT_H */ |