From 5a28766415850838d0cd8bb860eb1b3615f935d2 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 16 Jun 2010 22:30:42 +0200
Subject: [PATCH] --- yaml --- r: 205491 b: refs/heads/master c:
 d7a0380dc3e6607d30ccdfc3cfc2ccee0d966716 h: refs/heads/master i:   205489:
 6c1321750a7e9927ff2df6ad7e495f6d2fe5f946   205487:
 accbbb116d8f79cbbf7cb29889d5c21dedbd183d v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/vdso/vdso32-setup.c | 2 +-
 trunk/arch/x86/vdso/vma.c          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 32f537b913d5..4cc3fd5e0262 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b8f79b927b6b302bb65fb8c56e7a19be5fbdbef
+refs/heads/master: d7a0380dc3e6607d30ccdfc3cfc2ccee0d966716
diff --git a/trunk/arch/x86/vdso/vdso32-setup.c b/trunk/arch/x86/vdso/vdso32-setup.c
index 02b442e92007..36df991985b2 100644
--- a/trunk/arch/x86/vdso/vdso32-setup.c
+++ b/trunk/arch/x86/vdso/vdso32-setup.c
@@ -374,7 +374,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
 
 #ifdef CONFIG_X86_64
 
-__initcall(sysenter_setup);
+subsys_initcall(sysenter_setup);
 
 #ifdef CONFIG_SYSCTL
 /* Register vsyscall32 into the ABI table */
diff --git a/trunk/arch/x86/vdso/vma.c b/trunk/arch/x86/vdso/vma.c
index ac74869b8140..43456ee17692 100644
--- a/trunk/arch/x86/vdso/vma.c
+++ b/trunk/arch/x86/vdso/vma.c
@@ -74,7 +74,7 @@ static int __init init_vdso_vars(void)
 	vdso_enabled = 0;
 	return -ENOMEM;
 }
-__initcall(init_vdso_vars);
+subsys_initcall(init_vdso_vars);
 
 struct linux_binprm;