3 files changed, 6 insertions, 11 deletions

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e25bf4440b51..887ef855be2a 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -20,9 +20,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
-config GENERIC_TIME
-        def_bool y
-
 config GENERIC_CMOS_UPDATE
         def_bool y
 
diff --git a/arch/cris/arch-v32/mm/intmem.c b/arch/cris/arch-v32/mm/intmem.c
index 9e8b69cdf19e..1b17d92cef8e 100644
--- a/arch/cris/arch-v32/mm/intmem.c
+++ b/arch/cris/arch-v32/mm/intmem.c
@@ -33,8 +33,8 @@ static void crisv32_intmem_init(void)
 {
         static int initiated = 0;
         if (!initiated) {
-                struct intmem_allocation* alloc =
-                  (struct intmem_allocation*)kmalloc(sizeof *alloc, GFP_KERNEL);
+                struct intmem_allocation* alloc;
+                alloc = kmalloc(sizeof *alloc, GFP_KERNEL);
                 INIT_LIST_HEAD(&intmem_allocations);
                 intmem_virtual = ioremap(MEM_INTMEM_START + RESERVED_SIZE,
                                          MEM_INTMEM_SIZE - RESERVED_SIZE);
@@ -62,9 +62,8 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
                 if (allocation->status == STATUS_FREE &&
                     allocation->size >= size + alignment) {
                         if (allocation->size > size + alignment) {
-                                struct intmem_allocation* alloc =
-                                        (struct intmem_allocation*)
-                                        kmalloc(sizeof *alloc, GFP_ATOMIC);
+                                struct intmem_allocation* alloc;
+                                alloc = kmalloc(sizeof *alloc, GFP_ATOMIC);
                                 alloc->status = STATUS_FREE;
                                 alloc->size = allocation->size - size -
                                         alignment;
@@ -74,9 +73,7 @@ void* crisv32_intmem_alloc(unsigned size, unsigned align)
 
                                 if (alignment) {
                                         struct intmem_allocation *tmp;
-                                        tmp = (struct intmem_allocation *)
-                                                kmalloc(sizeof *tmp,
-                                                        GFP_ATOMIC);
+                                        tmp = kmalloc(sizeof *tmp, GFP_ATOMIC);
                                         tmp->offset = allocation->offset;
                                         tmp->size = alignment;
                                         tmp->status = STATUS_FREE;
diff --git a/arch/cris/include/asm/local64.h b/arch/cris/include/asm/local64.h
new file mode 100644
index 000000000000..36c93b5cc239
--- /dev/null
+++ b/arch/cris/include/asm/local64.h
@@ -0,0 +1 @@
+#include <asm-generic/local64.h>