diff options
| author | Ingo Molnar <[email protected]> | 2008-08-14 10:55:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-08-14 10:55:26 +0200 |
| commit | d4439087d316613548c70472291bf4ca646ce24b (patch) | |
| tree | 4819f39cbbfcc2ed9c9f85c7a91cbf142f5b02d4 /arch/ia64/include/asm/machvec_dig.h | |
| parent | 26d809af6397ce5c37f5c44d89734d19cce1ad25 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/ia64/include/asm/machvec_dig.h')
| -rw-r--r-- | arch/ia64/include/asm/machvec_dig.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/machvec_dig.h b/arch/ia64/include/asm/machvec_dig.h new file mode 100644 index 000000000000..8a0752f40987 --- /dev/null +++ b/arch/ia64/include/asm/machvec_dig.h @@ -0,0 +1,16 @@ +#ifndef _ASM_IA64_MACHVEC_DIG_h +#define _ASM_IA64_MACHVEC_DIG_h + +extern ia64_mv_setup_t dig_setup; + +/* + * This stuff has dual use! + * + * For a generic kernel, the macros are used to initialize the + * platform's machvec structure. When compiling a non-generic kernel, + * the macros are used directly. + */ +#define platform_name "dig" +#define platform_setup dig_setup + +#endif /* _ASM_IA64_MACHVEC_DIG_h */ |