Pull release into acpica branch

1 files changed, 3 insertions, 3 deletions

diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 94e07e727395..09b99029ac1a 100644
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -25,8 +25,8 @@
  * Limits for PMC and PMD are set to less than maximum architected values
  * but should be sufficient for a while
  */
-#define IA64_NUM_PMC_REGS       32
-#define IA64_NUM_PMD_REGS       32
+#define IA64_NUM_PMC_REGS       64
+#define IA64_NUM_PMD_REGS       64
 
 #define DEFAULT_MAP_BASE        __IA64_UL_CONST(0x2000000000000000)
 #define DEFAULT_TASK_SIZE       __IA64_UL_CONST(0xa000000000000000)
@@ -352,7 +352,7 @@ extern unsigned long get_wchan (struct task_struct *p);
 /* Return instruction pointer of blocked task TSK.  */
 #define KSTK_EIP(tsk)                                   \
   ({                                                    \
-        struct pt_regs *_regs = ia64_task_regs(tsk);    \
+        struct pt_regs *_regs = task_pt_regs(tsk);      \
         _regs->cr_iip + ia64_psr(_regs)->ri;            \
   })