More space for static inline pagetable helpers

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/include/arch/x86/page-pae.h b/include/arch/x86/page-pae.h
index 2635154272b4178469cdf173d368b8f9fac7f867..76543d4293034a1a115c8883bc08a64a52a43dfa 100644 (file)
--- a/include/arch/x86/page-pae.h
+++ b/include/arch/x86/page-pae.h
@@ -31,14 +31,22 @@
 typedef uint64_t pae_intpte_t;
 
 static inline unsigned int pae_l1_table_offset(unsigned long va)
-{ return (va >> PAE_L1_PT_SHIFT) & (PAE_L1_PT_ENTRIES - 1); }
+{
+    return (va >> PAE_L1_PT_SHIFT) & (PAE_L1_PT_ENTRIES - 1);
+}
 static inline unsigned int pae_l2_table_offset(unsigned long va)
-{ return (va >> PAE_L2_PT_SHIFT) & (PAE_L2_PT_ENTRIES - 1); }
+{
+    return (va >> PAE_L2_PT_SHIFT) & (PAE_L2_PT_ENTRIES - 1);
+}
 static inline unsigned int pae_l3_table_offset(unsigned long va)
-{ return (va >> PAE_L3_PT_SHIFT) & (PAE_L3_PT_ENTRIES - 1); }
+{
+    return (va >> PAE_L3_PT_SHIFT) & (PAE_L3_PT_ENTRIES - 1);
+}
 #ifdef __x86_64__
 static inline unsigned int pae_l4_table_offset(unsigned long va)
-{ return (va >> PAE_L4_PT_SHIFT) & (PAE_L4_PT_ENTRIES - 1); }
+{
+    return (va >> PAE_L4_PT_SHIFT) & (PAE_L4_PT_ENTRIES - 1);
+}
 #endif /* __x86_64__ */
 
 #endif /* __ASSEMBLY__ */

diff --git a/include/arch/x86/page-pse.h b/include/arch/x86/page-pse.h
index 013b5bf353bbb312ccb0ac669923f800bedbb8f6..a661ebbef46e072ee6a64696d989f6ad721d4cc2 100644 (file)
--- a/include/arch/x86/page-pse.h
+++ b/include/arch/x86/page-pse.h
@@ -24,9 +24,13 @@
 typedef uint32_t pse_intpte_t;
 
 static inline unsigned int pse_l1_table_offset(unsigned long va)
-{ return (va >> PSE_L1_PT_SHIFT) & (PSE_L1_PT_ENTRIES - 1); }
+{
+    return (va >> PSE_L1_PT_SHIFT) & (PSE_L1_PT_ENTRIES - 1);
+}
 static inline unsigned int pse_l2_table_offset(unsigned long va)
-{ return (va >> PSE_L2_PT_SHIFT) & (PSE_L2_PT_ENTRIES - 1); }
+{
+    return (va >> PSE_L2_PT_SHIFT) & (PSE_L2_PT_ENTRIES - 1);
+}
 
 #endif /* __ASSEMBLY__ */
 #endif /* XTF_X86_PAGE_PSE_H */

diff --git a/include/arch/x86/page.h b/include/arch/x86/page.h
index c363761f58d59b1e5c4c0eb9bbb7daf5bba8e0b4..d688b8d04007ba85b619d94f7e2c4522a9b8a510 100644 (file)
--- a/include/arch/x86/page.h
+++ b/include/arch/x86/page.h
@@ -65,39 +65,53 @@
 typedef pse_intpte_t intpte_t;
 
 static inline unsigned int l1_table_offset(unsigned long va)
-{ return pse_l1_table_offset(va); }
+{
+    return pse_l1_table_offset(va);
+}
 static inline unsigned int l2_table_offset(unsigned long va)
-{ return pse_l2_table_offset(va); }
+{
+    return pse_l2_table_offset(va);
+}
 
 #else /* CONFIG_PAGING_LEVELS == 2 */ /* PAE Paging */
 
 typedef pae_intpte_t intpte_t;
 
 static inline unsigned int l1_table_offset(unsigned long va)
-{ return pae_l1_table_offset(va); }
+{
+    return pae_l1_table_offset(va);
+}
 static inline unsigned int l2_table_offset(unsigned long va)
-{ return pae_l2_table_offset(va); }
+{
+    return pae_l2_table_offset(va);
+}
 
 #endif /* !CONFIG_PAGING_LEVELS == 2 */
 
 #if CONFIG_PAGING_LEVELS >= 3 /* PAE Paging */
 
 static inline unsigned int l3_table_offset(unsigned long va)
-{ return pae_l3_table_offset(va); }
+{
+    return pae_l3_table_offset(va);
+}
 
 #endif /* CONFIG_PAGING_LEVELS >= 3 */
 
 #if CONFIG_PAGING_LEVELS >= 4 /* PAE Paging */
 
 static inline unsigned int l4_table_offset(unsigned long va)
-{ return pae_l4_table_offset(va); }
+{
+    return pae_l4_table_offset(va);
+}
 
 #endif /* CONFIG_PAGING_LEVELS >= 4 */
 
 #if CONFIG_PAGING_LEVELS > 0
 
 static inline uint64_t pte_to_paddr(intpte_t pte)
-{ return pte & 0x000ffffffffff000ULL; }
+{
+    return pte & 0x000ffffffffff000ULL;
+}
 
 #endif /* CONFIG_PAGING_LEVELS > 0 */