Merge tag 'ia64-3.5-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

Pull Itanium fixes from Tony Luck.

* tag 'ia64-3.5-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Liberate the signal layer from IA64 assembler
  [IA64] Add cmpxchg.h to exported userspace headers
  [IA64] Fix fast syscall version of getcpu()
  [IA64] Removed "task_size" element from thread_struct - it is now constant

diff --combined arch/ia64/include/asm/processor.h
index 5a994ec8f06d4e358a3ee478f2057fd91d47cfbf,a1e70223db4abb9142dc37db18488a302e5fd6dd..832dd3789e9d02c14471730ddfbbf85d60e816da
--- 1/arch/ia64/include/asm/processor.h
--- 2/arch/ia64/include/asm/processor.h
+++ b/arch/ia64/include/asm/processor.h
@@@ -34,8 -34,7 +34,7 @@@
   * each (assuming 8KB page size), for a total of 8TB of user virtual
   * address space.
   */
- #define TASK_SIZE_OF(tsk)     ((tsk)->thread.task_size)
- #define TASK_SIZE             TASK_SIZE_OF(current)
+ #define TASK_SIZE             DEFAULT_TASK_SIZE
  
  /*
   * This decides where the kernel will search for a free chunk of vm
@@@ -280,7 -279,6 +279,6 @@@ struct thread_struct 
        __u8 pad[3];
        __u64 ksp;                      /* kernel stack pointer */
        __u64 map_base;                 /* base address for get_unmapped_area() */
-       __u64 task_size;                /* limit for task size */
        __u64 rbs_bot;                  /* the base address for the RBS */
        int last_fph_cpu;               /* CPU that may hold the contents of f32-f127 */
  
@@@ -303,7 -301,6 +301,6 @@@
        .ksp =          0,                                      \
        .map_base =     DEFAULT_MAP_BASE,                       \
        .rbs_bot =      STACK_TOP - DEFAULT_USER_STACK_SIZE,    \
-       .task_size =    DEFAULT_TASK_SIZE,                      \
        .last_fph_cpu =  -1,                                    \
        INIT_THREAD_PM                                          \
        .dbr =          {0, },                                  \
@@@ -343,6 -340,9 +340,6 @@@ struct task_struct
   */
  #define release_thread(dead_task)
  
 -/* Prepare to copy thread state - unlazy all lazy status */
 -#define prepare_to_copy(tsk)  do { } while (0)
 -
  /*
   * This is the mechanism for creating a new kernel thread.
   *
@@@ -720,6 -720,7 +717,6 @@@ extern unsigned long boot_option_idle_o
  enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_FORCE_MWAIT,
                         IDLE_NOMWAIT, IDLE_POLL};
  
 -void cpu_idle_wait(void);
  void default_idle(void);
  
  #define ia64_platform_is(x) (strcmp(x, platform_name) == 0)