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/sh/include/cpu-common/cpu/mmu_context.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/sh/include/cpu-common/cpu/mmu_context.h')
-rw-r--r-- | arch/sh/include/cpu-common/cpu/mmu_context.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/sh/include/cpu-common/cpu/mmu_context.h b/arch/sh/include/cpu-common/cpu/mmu_context.h new file mode 100644 index 000000000000..beeb299e01ec --- /dev/null +++ b/arch/sh/include/cpu-common/cpu/mmu_context.h @@ -0,0 +1,16 @@ +/* + * include/asm-sh/cpu-sh2/mmu_context.h + * + * Copyright (C) 2003 Paul Mundt + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef __ASM_CPU_SH2_MMU_CONTEXT_H +#define __ASM_CPU_SH2_MMU_CONTEXT_H + +/* No MMU */ + +#endif /* __ASM_CPU_SH2_MMU_CONTEXT_H */ + |