diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-01-24 14:49:14 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-01-24 14:49:14 +0100 |
| commit | 60ee4fbc385f386dc46ba5e61c9fe280424ed368 (patch) | |
| tree | 78f9ee1f9111e57b3edf4dc4920dff748982ff2c /tools/libxc/xg_private.h | |
| parent | 3e9ba471226315fd54e52594ecc021155ef31221 (diff) | |
| download | xen-60ee4fbc385f386dc46ba5e61c9fe280424ed368.tar.gz xen-60ee4fbc385f386dc46ba5e61c9fe280424ed368.tar.bz2 xen-60ee4fbc385f386dc46ba5e61c9fe280424ed368.zip | |
libxc: drop relics of running on non-PAE 32-bit hosts
Additionally drop unused (and dangerous) defines and typedefs, plus
a minor legibility improvement to setup_pgtables_x86_{32_pae,64}().
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Ian Campbell <Ian.Campbell@citrix.com>
Diffstat (limited to 'tools/libxc/xg_private.h')
| -rw-r--r-- | tools/libxc/xg_private.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h index a271942e7d..db02ccf470 100644 --- a/tools/libxc/xg_private.h +++ b/tools/libxc/xg_private.h @@ -84,22 +84,6 @@ unsigned long csum_page (void * page); #define L3_PAGETABLE_ENTRIES_X86_64 512 #define L4_PAGETABLE_ENTRIES_X86_64 512 -#if defined(__i386__) -#define L1_PAGETABLE_SHIFT L1_PAGETABLE_SHIFT_I386 -#define L2_PAGETABLE_SHIFT L2_PAGETABLE_SHIFT_I386 -#define L1_PAGETABLE_ENTRIES L1_PAGETABLE_ENTRIES_I386 -#define L2_PAGETABLE_ENTRIES L2_PAGETABLE_ENTRIES_I386 -#elif defined(__x86_64__) -#define L1_PAGETABLE_SHIFT L1_PAGETABLE_SHIFT_X86_64 -#define L2_PAGETABLE_SHIFT L2_PAGETABLE_SHIFT_X86_64 -#define L3_PAGETABLE_SHIFT L3_PAGETABLE_SHIFT_X86_64 -#define L4_PAGETABLE_SHIFT L4_PAGETABLE_SHIFT_X86_64 -#define L1_PAGETABLE_ENTRIES L1_PAGETABLE_ENTRIES_X86_64 -#define L2_PAGETABLE_ENTRIES L2_PAGETABLE_ENTRIES_X86_64 -#define L3_PAGETABLE_ENTRIES L3_PAGETABLE_ENTRIES_X86_64 -#define L4_PAGETABLE_ENTRIES L4_PAGETABLE_ENTRIES_X86_64 -#endif - typedef uint32_t l1_pgentry_32_t; typedef uint32_t l2_pgentry_32_t; typedef uint64_t l1_pgentry_64_t; @@ -107,16 +91,6 @@ typedef uint64_t l2_pgentry_64_t; typedef uint64_t l3_pgentry_64_t; typedef uint64_t l4_pgentry_64_t; -#if defined(__i386__) -typedef l1_pgentry_32_t l1_pgentry_t; -typedef l2_pgentry_32_t l2_pgentry_t; -#elif defined(__x86_64__) -typedef l1_pgentry_64_t l1_pgentry_t; -typedef l2_pgentry_64_t l2_pgentry_t; -typedef l3_pgentry_64_t l3_pgentry_t; -typedef l4_pgentry_64_t l4_pgentry_t; -#endif - #define l1_table_offset_i386(_a) \ (((_a) >> L1_PAGETABLE_SHIFT_I386) & (L1_PAGETABLE_ENTRIES_I386 - 1)) #define l2_table_offset_i386(_a) \ @@ -138,16 +112,6 @@ typedef l4_pgentry_64_t l4_pgentry_t; #define l4_table_offset_x86_64(_a) \ (((_a) >> L4_PAGETABLE_SHIFT_X86_64) & (L4_PAGETABLE_ENTRIES_X86_64 - 1)) -#if defined(__i386__) -#define l1_table_offset(_a) l1_table_offset_i386(_a) -#define l2_table_offset(_a) l2_table_offset_i386(_a) -#elif defined(__x86_64__) -#define l1_table_offset(_a) l1_table_offset_x86_64(_a) -#define l2_table_offset(_a) l2_table_offset_x86_64(_a) -#define l3_table_offset(_a) l3_table_offset_x86_64(_a) -#define l4_table_offset(_a) l4_table_offset_x86_64(_a) -#endif - #define PAGE_SHIFT_ARM 12 #define PAGE_SIZE_ARM (1UL << PAGE_SHIFT_ARM) #define PAGE_MASK_ARM (~(PAGE_SIZE_ARM-1)) |