Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/arch/s390/kernel/relocate_kernel.S b/arch/s390/kernel/relocate_kernel.S
index f9899ff2e5b0..3b456b80bcee 100644
--- a/arch/s390/kernel/relocate_kernel.S
+++ b/arch/s390/kernel/relocate_kernel.S
@@ -26,8 +26,7 @@
         relocate_kernel:
                 basr    %r13,0          # base address
         .base:
-                stnsm   sys_msk-.base(%r13),0xf8        # disable DAT and IRQ (external)
-                spx     zero64-.base(%r13)      # absolute addressing mode
+                stnsm   sys_msk-.base(%r13),0xfb        # disable DAT
                 stctl   %c0,%c15,ctlregs-.base(%r13)
                 stm     %r0,%r15,gprregs-.base(%r13)
                 la      %r1,load_psw-.base(%r13)
@@ -97,8 +96,6 @@
                 lpsw    0               # hopefully start new kernel...
 
                 .align  8
-        zero64:
-                .quad   0
         load_psw:
                 .long   0x00080000,0x80000000
         sys_msk: