summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorAttilio Rao <attilio.rao@citrix.com>2012-08-21 22:22:38 +0200
committerThomas Gleixner <tglx@linutronix.de>2012-09-12 15:33:06 +0200
commit7737b215ad0f94d20a87d98315da9f6cadaf35c9 (patch)
treeba7c20bfd9c6e002c7ebac9bec0657258ddedfa6 /arch/x86/include
parentx86: Remove base argument from x86_init.paging.pagetable_setup_start (diff)
downloadlinux-7737b215ad0f94d20a87d98315da9f6cadaf35c9.tar.xz
linux-7737b215ad0f94d20a87d98315da9f6cadaf35c9.zip
x86: Rename pagetable_setup_start() to pagetable_init()
In preparation for unifying the pagetable_setup_start() and pagetable_setup_done() setup functions, rename appropriately all the infrastructure related to pagetable_setup_start(). Signed-off-by: Attilio Rao <attilio.rao@citrix.com> Ackedd-by: <konrad.wilk@oracle.com> Cc: <Ian.Campbell@citrix.com> Cc: <Stefano.Stabellini@eu.citrix.com> Cc: <xen-devel@lists.xensource.com> Link: http://lkml.kernel.org/r/1345580561-8506-3-git-send-email-attilio.rao@citrix.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/pgtable_types.h4
-rw-r--r--arch/x86/include/asm/x86_init.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index e02b875e6922..0c01e0730f7b 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -303,10 +303,10 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pte);
extern void native_pagetable_reserve(u64 start, u64 end);
#ifdef CONFIG_X86_32
-extern void native_pagetable_setup_start(void);
+extern void native_pagetable_init(void);
extern void native_pagetable_setup_done(pgd_t *base);
#else
-#define native_pagetable_setup_start x86_init_pgd_start_noop
+#define native_pagetable_init x86_init_pgd_init_noop
#define native_pagetable_setup_done x86_init_pgd_done_noop
#endif
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 782ba0c4b266..24084b2b3a43 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -81,11 +81,11 @@ struct x86_init_mapping {
/**
* struct x86_init_paging - platform specific paging functions
- * @pagetable_setup_start: platform specific pre paging_init() call
+ * @pagetable_init: platform specific paging initialization call
* @pagetable_setup_done: platform specific post paging_init() call
*/
struct x86_init_paging {
- void (*pagetable_setup_start)(void);
+ void (*pagetable_init)(void);
void (*pagetable_setup_done)(pgd_t *base);
};