From 69c8d43d84ab50d402ffeedb7ace688087be9cf3 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 24 Jan 2013 12:19:47 -0800 Subject: [PATCH] --- yaml --- r: 356231 b: refs/heads/master c: 231b3642a3c73fb9f1221dcb96fe8c0fbb658dfd h: refs/heads/master i: 356229: 135a18369be66fbc4dbd9d1f8223b35c83fbde30 356227: d7d45210bc0e0f42fcab95d319396a82318b26f3 356223: 0741e658e1968bcc77ec1915b2f4f95002c962f4 v: v3 --- [refs] | 2 +- trunk/arch/x86/realmode/init.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8c8cc5a25db2..9e434a144dcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2bdee594ebcf4a531afe795baf18da509438392 +refs/heads/master: 231b3642a3c73fb9f1221dcb96fe8c0fbb658dfd diff --git a/trunk/arch/x86/realmode/init.c b/trunk/arch/x86/realmode/init.c index cbca565af5bd..c44ea7cf5741 100644 --- a/trunk/arch/x86/realmode/init.c +++ b/trunk/arch/x86/realmode/init.c @@ -84,10 +84,12 @@ void __init setup_real_mode(void) } /* - * set_real_mode_permissions() gets called very early, to guarantee the - * availability of low memory. This is before the proper kernel page + * setup_real_mode() gets called very early, to guarantee the + * availability of low memory. This is before the proper kernel page * tables are set up, so we cannot set page permissions in that - * function. Thus, we use an arch_initcall instead. + * function. Also trampoline code will be executed by APs so we + * need to mark it executable at do_pre_smp_initcalls() at least, + * thus run it as a early_initcall(). */ static int __init set_real_mode_permissions(void) { @@ -111,5 +113,4 @@ static int __init set_real_mode_permissions(void) return 0; } - -arch_initcall(set_real_mode_permissions); +early_initcall(set_real_mode_permissions);