xen: Remove x86_32 build target.

Signed-off-by: Keir Fraser <keir@xen.org>

4 files changed, 1 insertions, 42 deletions

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 9eba8bc2e0..c1c100f6a3 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -56,7 +56,6 @@ obj-$(CONFIG_XENCOMM) += xencomm.o
 
 subdir-$(CONFIG_COMPAT) += compat
 
-subdir-$(x86_32) += hvm
 subdir-$(x86_64) += hvm
 
 subdir-y += libelf
diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index d7599448d2..f4812b911c 100644
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -50,7 +50,7 @@
 #define INVERT_SENTINEL(_x,_y) _x->sentinel = ~_y##_SENTINEL
 #define ASSERT_SENTINEL(_x,_y) \
     ASSERT(_x->sentinel != ~_y##_SENTINEL);ASSERT(_x->sentinel == _y##_SENTINEL)
-#if defined(__i386__) || defined(CONFIG_ARM)
+#if defined(CONFIG_ARM)
 #define POOL_SENTINEL 0x87658765
 #define OBJ_SENTINEL 0x12345678
 #define OBJNODE_SENTINEL 0xfedcba09
@@ -1233,11 +1233,7 @@ static client_t *client_create(cli_id_t cli_id)
         goto fail;
     }
     client->cli_id = cli_id;
-#ifdef __i386__
-    client->compress = 0;
-#else
     client->compress = tmh_compression_enabled();
-#endif
     client->shared_auth_required = tmh_shared_auth();
     for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++)
         client->shared_auth_uuid[i][0] =
@@ -1460,9 +1456,6 @@ static NOINLINE int do_tmem_put_compress(pgp_t *pgp, tmem_cli_mfn_t cmfn,
     ASSERT_SPINLOCK(&pgp->us.obj->obj_spinlock);
     ASSERT(pgp->us.obj->pool != NULL);
     ASSERT(pgp->us.obj->pool->client != NULL);
-#ifdef __i386__
-    return -ENOMEM;
-#endif
 
     if ( pgp->pfp != NULL )
         pgp_free_data(pgp, pgp->us.obj->pool);
@@ -2275,9 +2268,6 @@ static int tmemc_set_var_one(client_t *client, uint32_t subop, uint32_t arg1)
                         arg1, cli_id_str, cli_id);
         break;
     case TMEMC_SET_COMPRESS:
-#ifdef __i386__
-        return -1;
-#endif
         if ( tmh_dedup_enabled() )
         {
             tmh_client_warn("tmem: compression %s for all %ss, cannot be changed when tmem_dedup is enabled\n",
@@ -2892,9 +2882,6 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags)
 
     if (!tmh_enabled() || !tmh_freeable_pages())
         return NULL;
-#ifdef __i386__
-    return NULL;
-#endif
 
     relinq_attempts++;
     if ( order > 0 )
diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c
index 6b3d9dde97..9dc2a1d03a 100644
--- a/xen/common/tmem_xen.c
+++ b/xen/common/tmem_xen.c
@@ -348,7 +348,6 @@ EXPORT void tmh_scrub_page(struct page_info *pi, unsigned int memflags)
         scrub_one_page(pi);
 }
 
-#ifndef __i386__
 static noinline void *tmh_mempool_page_get(unsigned long size)
 {
     struct page_info *pi;
@@ -398,7 +397,6 @@ static void tmh_persistent_pool_page_put(void *page_va)
     ASSERT(IS_VALID_PAGE(pi));
     _tmh_free_page_thispool(pi);
 }
-#endif
 
 /******************  XEN-SPECIFIC CLIENT HANDLING ********************/
 
@@ -413,7 +411,6 @@ EXPORT tmh_client_t *tmh_client_init(cli_id_t cli_id)
     for (i = 0, shift = 12; i < 4; shift -=4, i++)
         name[i] = (((unsigned short)cli_id >> shift) & 0xf) + '0';
     name[4] = '\0';
-#ifndef __i386__
     tmh->persistent_pool = xmem_pool_create(name, tmh_persistent_pool_page_get,
         tmh_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE);
     if ( tmh->persistent_pool == NULL )
@@ -421,23 +418,18 @@ EXPORT tmh_client_t *tmh_client_init(cli_id_t cli_id)
         xfree(tmh);
         return NULL;
     }
-#endif
     return tmh;
 }
 
 EXPORT void tmh_client_destroy(tmh_client_t *tmh)
 {
     ASSERT(tmh->domain->is_dying);
-#ifndef __i386__
     xmem_pool_destroy(tmh->persistent_pool);
-#endif
     tmh->domain = NULL;
 }
 
 /******************  XEN-SPECIFIC HOST INITIALIZATION ********************/
 
-#ifndef __i386__
-
 static int dstmem_order, workmem_order;
 
 static int cpu_callback(
@@ -517,12 +509,3 @@ EXPORT int __init tmh_init(void)
 
     return 1;
 }
-
-#else
-
-EXPORT int __init tmh_init(void)
-{
-    return 1;
-}
-
-#endif
diff --git a/xen/common/wait.c b/xen/common/wait.c
index 81ecc7e220..aaeabc9bcc 100644
--- a/xen/common/wait.c
+++ b/xen/common/wait.c
@@ -140,7 +140,6 @@ static void __prepare_to_wait(struct waitqueue_vcpu *wqv)
     }
 
     asm volatile (
-#ifdef CONFIG_X86_64
         "push %%rax; push %%rbx; push %%rdx; "
         "push %%rbp; push %%r8; push %%r9; push %%r10; push %%r11; "
         "push %%r12; push %%r13; push %%r14; push %%r15; call 1f; "
@@ -151,15 +150,6 @@ static void __prepare_to_wait(struct waitqueue_vcpu *wqv)
         "pop %%r15; pop %%r14; pop %%r13; pop %%r12; "
         "pop %%r11; pop %%r10; pop %%r9; pop %%r8; "
         "pop %%rbp; pop %%rdx; pop %%rbx; pop %%rax"
-#else
-        "push %%eax; push %%ebx; push %%edx; "
-        "push %%ebp; call 1f; "
-        "1: mov %%esp,%%esi; addl $2f-1b,(%%esp); "
-        "sub %%esi,%%ecx; cmp %3,%%ecx; jbe 2f; "
-        "xor %%esi,%%esi; jmp 3f; "
-        "2: rep movsb; mov %%esp,%%esi; 3: pop %%eax; "
-        "pop %%ebp; pop %%edx; pop %%ebx; pop %%eax"
-#endif
         : "=&S" (wqv->esp), "=&c" (dummy), "=&D" (dummy)
         : "i" (PAGE_SIZE), "1" (cpu_info), "2" (wqv->stack)
         : "memory" );