3 files changed, 3 insertions, 4 deletions

diff --git a/include/asm-parisc/compat.h b/include/asm-parisc/compat.h
index ca0eac647a05..7630d1ad2391 100644
--- a/include/asm-parisc/compat.h
+++ b/include/asm-parisc/compat.h
@@ -24,7 +24,7 @@ typedef u16	compat_nlink_t;
 typedef u16     compat_ipc_pid_t;
 typedef s32     compat_daddr_t;
 typedef u32     compat_caddr_t;
-typedef u32     compat_timer_t;
+typedef s32     compat_timer_t;
 
 typedef s32     compat_int_t;
 typedef s32     compat_long_t;
diff --git a/include/asm-parisc/mmzone.h b/include/asm-parisc/mmzone.h
index 928bf50c4693..595d3dce120a 100644
--- a/include/asm-parisc/mmzone.h
+++ b/include/asm-parisc/mmzone.h
@@ -19,7 +19,6 @@ extern struct node_map_data node_data[];
  */
 #define kvaddr_to_nid(kaddr)    pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT)
 
-#define node_mem_map(nid)       (NODE_DATA(nid)->node_mem_map)
 #define node_start_pfn(nid)     (NODE_DATA(nid)->node_start_pfn)
 #define node_end_pfn(nid)                                               \
 ({                                                                      \
@@ -38,7 +37,7 @@ extern struct node_map_data node_data[];
 ({                                                                      \
         unsigned long __pfn = (pfn);                                    \
         int __node  = pfn_to_nid(__pfn);                                \
-        &node_mem_map(__node)[node_localnr(__pfn,__node)];              \
+        &NODE_DATA(__node)->node_mem_map[node_localnr(__pfn,__node)];   \
 })
 
 #define page_to_pfn(pg)                                                 \
diff --git a/include/asm-parisc/thread_info.h b/include/asm-parisc/thread_info.h
index fe9b7f8ae4c6..57bbb76cb6c1 100644
--- a/include/asm-parisc/thread_info.h
+++ b/include/asm-parisc/thread_info.h
@@ -12,7 +12,7 @@ struct thread_info {
         unsigned long flags;            /* thread_info flags (see TIF_*) */
         mm_segment_t addr_limit;        /* user-level address space limit */
         __u32 cpu;                      /* current CPU */
-        __s32 preempt_count;            /* 0=premptable, <0=BUG; will also serve as bh-counter */
+        int preempt_count;              /* 0=premptable, <0=BUG; will also serve as bh-counter */
         struct restart_block restart_block;
 };