Pull for-2.6.31 into release

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index a8d61a3e9a94..bc80dff1df7a 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -306,10 +306,10 @@ static void __cpuinit cpu_cache_sysfs_exit(unsigned int cpu)
 
 static int __cpuinit cpu_cache_sysfs_init(unsigned int cpu)
 {
-        u64 i, levels, unique_caches;
+        unsigned long i, levels, unique_caches;
         pal_cache_config_info_t cci;
         int j;
-        s64 status;
+        long status;
         struct cache_info *this_cache;
         int num_cache_leaves = 0;