Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] Update default configuration.
  [S390] Fix alignment of initial kernel stack.
  [S390] pgtable.h: Fix oops in unmap_vmas for KVM processes
  [S390] fix/cleanup sched_clock
  [S390] fix system call parameter functions.

diff --combined arch/s390/include/asm/ptrace.h
index 560ce8561dfdc8b248826d814f1126cf29880aca,fb0ca4796d3b318f4c6c6fc7aca5e8d184149bab..5396f9f122634bda4d0ce33bd78bd1747856e7d2
--- 1/arch/s390/include/asm/ptrace.h
--- 2/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@@ -321,8 -321,8 +321,8 @@@ struct pt_reg
        psw_t psw;
        unsigned long gprs[NUM_GPRS];
        unsigned long orig_gpr2;
+       unsigned short svcnr;
        unsigned short ilc;
-       unsigned short trap;
  };
  #endif
  
@@@ -486,6 -486,8 +486,6 @@@ struct task_struct
  extern void user_enable_single_step(struct task_struct *);
  extern void user_disable_single_step(struct task_struct *);
  
 -#define __ARCH_WANT_COMPAT_SYS_PTRACE
 -
  #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
  #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
  #define user_stack_pointer(regs)((regs)->gprs[15])