diff options
author | Attilio Rao <attilio.rao@citrix.com> | 2012-08-21 16:22:38 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-09-12 09:33:06 -0400 |
commit | 7737b215ad0f94d20a87d98315da9f6cadaf35c9 (patch) | |
tree | ba7c20bfd9c6e002c7ebac9bec0657258ddedfa6 /arch/x86/include | |
parent | 73090f8993a40a2f67fed1ab866a928c68cd3765 (diff) |
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.h | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/x86_init.h | 4 |
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); | |||
303 | 303 | ||
304 | extern void native_pagetable_reserve(u64 start, u64 end); | 304 | extern void native_pagetable_reserve(u64 start, u64 end); |
305 | #ifdef CONFIG_X86_32 | 305 | #ifdef CONFIG_X86_32 |
306 | extern void native_pagetable_setup_start(void); | 306 | extern void native_pagetable_init(void); |
307 | extern void native_pagetable_setup_done(pgd_t *base); | 307 | extern void native_pagetable_setup_done(pgd_t *base); |
308 | #else | 308 | #else |
309 | #define native_pagetable_setup_start x86_init_pgd_start_noop | 309 | #define native_pagetable_init x86_init_pgd_init_noop |
310 | #define native_pagetable_setup_done x86_init_pgd_done_noop | 310 | #define native_pagetable_setup_done x86_init_pgd_done_noop |
311 | #endif | 311 | #endif |
312 | 312 | ||
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 { | |||
81 | 81 | ||
82 | /** | 82 | /** |
83 | * struct x86_init_paging - platform specific paging functions | 83 | * struct x86_init_paging - platform specific paging functions |
84 | * @pagetable_setup_start: platform specific pre paging_init() call | 84 | * @pagetable_init: platform specific paging initialization call |
85 | * @pagetable_setup_done: platform specific post paging_init() call | 85 | * @pagetable_setup_done: platform specific post paging_init() call |
86 | */ | 86 | */ |
87 | struct x86_init_paging { | 87 | struct x86_init_paging { |
88 | void (*pagetable_setup_start)(void); | 88 | void (*pagetable_init)(void); |
89 | void (*pagetable_setup_done)(pgd_t *base); | 89 | void (*pagetable_setup_done)(pgd_t *base); |
90 | }; | 90 | }; |
91 | 91 | ||