> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
> ---
> Documentation/cachetlb.txt | 2 +-
> include/linux/mm_types.h | 9 ++++++---
> include/linux/sched.h | 1 +
> init/main.c | 2 ++
> kernel/fork.c | 37 ++++++++++++++++++++++++++++++++++---
> mm/init-mm.c | 1 -
> 6 files changed, 44 insertions(+), 8 deletions(-)
>
> This patch don't touch x86/kerrnel/tboot.c. because it can't be compiled.
My bad. I confounded CONFIG_HAVE_INTEL_TXT with CONFIG_INTEL_TXT. Proper
fixing (and incremental) patch is here.
>From 0b443d8dbdf7ce97f92e6622840585ca41abca83 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Date: Tue, 19 Apr 2011 08:38:01 +0900
Subject: [PATCH 4/4] fix tboot
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
---
arch/x86/kernel/tboot.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index 998e972..0f0d1a3 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -110,7 +110,6 @@ static struct mm_struct tboot_mm = {
.mmap_sem = __RWSEM_INITIALIZER(init_mm.mmap_sem),
.page_table_lock = __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock),
.mmlist = LIST_HEAD_INIT(init_mm.mmlist),
- .cpu_vm_mask = CPU_MASK_ALL,
};
static inline void switch_to_tboot_pt(void)
@@ -337,9 +336,18 @@ static struct notifier_block tboot_cpu_notifier __cpuinitdata =
static __init int tboot_late_init(void)
{
+ int ret;
+
if (!tboot_enabled())
return 0;
+ ret = mm_init_cpumask(&tboot_mm, 0);
+ if (ret) {
+ pr_warning("tboot: Allocation failure, disable tboot.\n");
+ tboot = NULL;
+ return ret;
+ }
+
tboot_create_trampoline();
atomic_set(&ap_wfs_count, 0);
--
1.7.3.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxxx For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href