Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

diff --combined arch/ia64/kernel/entry.S
index 915e12791836562a3441d6c4d51bbb6664a7ee37,6d70fec82d0e899f74f7428118fa2f9300f32f62..ba0b6a1f429fc315c17e4a8ace1cf8c5de8e0913
--- 1/arch/ia64/kernel/entry.S
--- 2/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@@ -37,7 -37,7 +37,7 @@@
  #include <asm/cache.h>
  #include <asm/errno.h>
  #include <asm/kregs.h>
- #include <asm/offsets.h>
+ #include <asm/asm-offsets.h>
  #include <asm/pgtable.h>
  #include <asm/percpu.h>
  #include <asm/processor.h>
@@@ -204,6 -204,9 +204,6 @@@ GLOBAL_ENTRY(ia64_switch_to
  (p6)  br.cond.dpnt .map
        ;;
  .done:
 -(p6)  ssm psr.ic                      // if we had to map, reenable the psr.ic bit FIRST!!!
 -      ;;
 -(p6)  srlz.d
        ld8 sp=[r21]                    // load kernel stack pointer of new task
        mov IA64_KR(CURRENT)=in0        // update "current" application register
        mov r8=r13                      // return pointer to previously running task
@@@ -231,9 -234,6 +231,9 @@@
        mov IA64_KR(CURRENT_STACK)=r26  // remember last page we mapped...
        ;;
        itr.d dtr[r25]=r23              // wire in new mapping...
 +      ssm psr.ic                      // reenable the psr.ic bit
 +      ;;
 +      srlz.d
        br.cond.sptk .done
  END(ia64_switch_to)
  
@@@ -470,29 -470,6 +470,29 @@@ ENTRY(load_switch_stack
        br.cond.sptk.many b7
  END(load_switch_stack)
  
 +GLOBAL_ENTRY(prefetch_stack)
 +      add r14 = -IA64_SWITCH_STACK_SIZE, sp
 +      add r15 = IA64_TASK_THREAD_KSP_OFFSET, in0
 +      ;;
 +      ld8 r16 = [r15]                         // load next's stack pointer
 +      lfetch.fault.excl [r14], 128
 +      ;;
 +      lfetch.fault.excl [r14], 128
 +      lfetch.fault [r16], 128
 +      ;;
 +      lfetch.fault.excl [r14], 128
 +      lfetch.fault [r16], 128
 +      ;;
 +      lfetch.fault.excl [r14], 128
 +      lfetch.fault [r16], 128
 +      ;;
 +      lfetch.fault.excl [r14], 128
 +      lfetch.fault [r16], 128
 +      ;;
 +      lfetch.fault [r16], 128
 +      br.ret.sptk.many rp
 +END(prefetch_switch_stack)
 +
  GLOBAL_ENTRY(execve)
        mov r15=__NR_execve                     // put syscall number in place
        break __BREAK_SYSCALL

diff --combined arch/ppc64/Makefile
index a91daa324e888464c825a42f6ecb252df291025b,d795775a5cd79405ed049a5d35fafc19b4fa0618..0a23aeacba885cf80e697d9c0a6e21317af5bc10
--- 1/arch/ppc64/Makefile
--- 2/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@@ -89,12 -89,11 +89,12 @@@ drivers-$(CONFIG_OPROFILE) += arch/ppc6
  
  boot := arch/ppc64/boot
  
 -boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd
 -boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd
 -boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm
 -boottarget-$(CONFIG_PPC_BPA) := zImage zImage.initrd
 -$(boottarget-y): vmlinux
 +boottargets-$(CONFIG_PPC_PSERIES) += zImage zImage.initrd
 +boottargets-$(CONFIG_PPC_PMAC) += zImage.vmode zImage.initrd.vmode
 +boottargets-$(CONFIG_PPC_MAPLE) += zImage zImage.initrd
 +boottargets-$(CONFIG_PPC_ISERIES) += vmlinux.sminitrd vmlinux.initrd vmlinux.sm
 +boottargets-$(CONFIG_PPC_BPA) += zImage zImage.initrd
 +$(boottargets-y): vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
  
  bootimage-$(CONFIG_PPC_PSERIES) := $(boot)/zImage
@@@ -117,13 -116,6 +117,6 @@@ archclean
        $(Q)$(MAKE) $(clean)=$(boot)
        $(Q)rm -rf include3
  
- prepare: include/asm-ppc64/offsets.h
- 
- arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                  include/config/MARKER
- 
- include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
-       $(call filechk,gen-asm-offsets)
  
  # Temporary hack until we have migrated to asm-powerpc
  include/asm: include3/asm
@@@ -132,12 -124,8 +125,10 @@@ include3/asm
        $(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm
  
  define archhelp
 -  echo  '* zImage       - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
 -  echo  '  zImage.initrd- Compressed kernel image with initrd attached,'
 -  echo  '                sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
 -  echo  '                (arch/$(ARCH)/boot/zImage.initrd)'
 +  echo  '  zImage.vmode        - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'
 +  echo  '  zImage.initrd.vmode - Compressed kernel image with initrd attached,'
 +  echo  '                        sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
 +  echo  '                        (arch/$(ARCH)/boot/zImage.initrd.vmode)'
 +  echo  '  zImage              - zImage for pSeries machines'
 +  echo  '  zImage.initrd       - zImage with initrd for pSeries machines'
  endef
- 
- CLEAN_FILES += include/asm-ppc64/offsets.h

diff --combined arch/ppc64/kernel/misc.S
index c047663eb48d14c9bf6e09f5f15b32a3f00bdf8c,757903544e2454d301f0c81a2f37aa5e8af4aebd..e7241ad80a08212758c2e2c2538246595714c21c
--- 1/arch/ppc64/kernel/misc.S
--- 2/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@@ -26,7 -26,7 +26,7 @@@
  #include <asm/page.h>
  #include <asm/cache.h>
  #include <asm/ppc_asm.h>
- #include <asm/offsets.h>
+ #include <asm/asm-offsets.h>
  #include <asm/cputable.h>
  
        .text
@@@ -1431,9 -1431,9 +1431,9 @@@ _GLOBAL(sys_call_table
        .llong .sys_ni_syscall          /* 195 - 32bit only stat64 */
        .llong .sys_ni_syscall          /* 32bit only lstat64 */
        .llong .sys_ni_syscall          /* 32bit only fstat64 */
 -      .llong .sys_ni_syscall          /* 32bit only pciconfig_read */
 -      .llong .sys_ni_syscall          /* 32bit only pciconfig_write */
 -      .llong .sys_ni_syscall          /* 32bit only pciconfig_iobase */
 +      .llong .sys_pciconfig_read
 +      .llong .sys_pciconfig_write
 +      .llong .sys_pciconfig_iobase    /* 200 - pciconfig_iobase */
        .llong .sys_ni_syscall          /* reserved for MacOnLinux */
        .llong .sys_getdents64
        .llong .sys_pivot_root

diff --combined arch/s390/Makefile
index c1ea6bcb77ce82cdf88a7aa4c2f3bf50b581a793,189c8f3a369ce612ecfeb6b7af352fb75350fcf7..98db30481d97eb211d1e767ca9701767e323dc09
--- 1/arch/s390/Makefile
--- 2/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@@ -19,7 -19,6 +19,7 @@@ CFLAGS                += -m3
  AFLAGS                += -m31
  UTS_MACHINE   := s390
  STACK_SIZE    := 8192
 +CHECKFLAGS    += -D__s390__
  endif
  
  ifdef CONFIG_ARCH_S390X
@@@ -29,7 -28,6 +29,7 @@@ CFLAGS                += -m6
  AFLAGS                += -m64
  UTS_MACHINE   := s390x
  STACK_SIZE    := 16384
 +CHECKFLAGS    += -D__s390__ -D__s390x__
  endif
  
  cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)
@@@ -102,16 -100,6 +102,6 @@@ image: vmlinu
  archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
  
- prepare: include/asm-$(ARCH)/offsets.h
- 
- arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                  include/config/MARKER
- 
- include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-       $(call filechk,gen-asm-offsets)
- 
- CLEAN_FILES += include/asm-$(ARCH)/offsets.h
- 
  # Don't use tabs in echo arguments
  define archhelp
    echo  '* image           - Kernel image for IPL ($(boot)/image)'