From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 20 Mar 2013 09:00:52 +0000 (+0100)
Subject: x86: BITS_PER_LONG is now always 64
X-Git-Tag: 4.3.0-rc1~181
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1d604e6ee4c7dde3e5db73cee5686ce559c8bf15;p=xen.git

x86: BITS_PER_LONG is now always 64

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c
index fa879821fe..1c69e4e194 100644
--- a/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c
@@ -1204,11 +1204,6 @@ static void x86_mc_mceinject(void *data)
 #define ID2COOKIE(id) ((mctelem_cookie_t)(id))
 #define COOKIE2ID(c) ((uint64_t)(c))
 
-#elif BITS_PER_LONG == 32
-
-#define ID2COOKIE(id) ((mctelem_cookie_t)(uint32_t)((id) & 0xffffffffU))
-#define COOKIE2ID(c) ((uint64_t)(uint32_t)(c))
-
 #elif defined(BITS_PER_LONG)
 #error BITS_PER_LONG has unexpected value
 #else
diff --git a/xen/include/asm-x86/div64.h b/xen/include/asm-x86/div64.h
index 1ce87cd5c7..dd49f64a3b 100644
--- a/xen/include/asm-x86/div64.h
+++ b/xen/include/asm-x86/div64.h
@@ -1,10 +1,8 @@
-#ifndef __I386_DIV64
-#define __I386_DIV64
+#ifndef __X86_DIV64
+#define __X86_DIV64
 
 #include <xen/types.h>
 
-#if BITS_PER_LONG == 64
-
 #define do_div(n,base) ({                       \
     uint32_t __base = (base);                   \
     uint32_t __rem;                             \
@@ -13,37 +11,4 @@
     __rem;                                      \
 })
 
-#else
-
-/*
- * do_div() is NOT a C function. It wants to return
- * two values (the quotient and the remainder), but
- * since that doesn't work very well in C, what it
- * does is:
- *
- * - modifies the 64-bit dividend _in_place_
- * - returns the 32-bit remainder
- *
- * This ends up being the most efficient "calling
- * convention" on x86.
- */
-#define do_div(n,base) ({                                       \
-    unsigned long __upper, __low, __high, __mod, __base;        \
-    __base = (base);                                            \
-    asm ( "" : "=a" (__low), "=d" (__high) : "A" (n) );         \
-    __upper = __high;                                           \
-    if ( __high )                                               \
-    {                                                           \
-        __upper = __high % (__base);                            \
-        __high = __high / (__base);                             \
-    }                                                           \
-    asm ( "divl %2"                                             \
-          : "=a" (__low), "=d" (__mod)                          \
-          : "rm" (__base), "0" (__low), "1" (__upper) );        \
-    asm ( "" : "=A" (n) : "a" (__low), "d" (__high) );          \
-    __mod;                                                      \
-})
-
-#endif
-
 #endif
diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h
index c551f964a1..9553e4329d 100644
--- a/xen/include/asm-x86/paging.h
+++ b/xen/include/asm-x86/paging.h
@@ -176,12 +176,8 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn);
                               (LOGDIRTY_NODE_ENTRIES-1))
 #define L3_LOGDIRTY_IDX(pfn) (((pfn) >> (PAGE_SHIFT+3+PAGETABLE_ORDER)) & \
                               (LOGDIRTY_NODE_ENTRIES-1))
-#if BITS_PER_LONG == 64
 #define L4_LOGDIRTY_IDX(pfn) (((pfn) >> (PAGE_SHIFT+3+PAGETABLE_ORDER*2)) & \
                               (LOGDIRTY_NODE_ENTRIES-1))
-#else
-#define L4_LOGDIRTY_IDX(pfn) 0
-#endif
 
 /* VRAM dirty tracking support */
 struct sh_dirty_vram {