Update of /cvsroot/linux-vax/kernel-2.4/arch/s390x
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/s390x
Modified Files:
Makefile config.in defconfig vmlinux-shared.lds vmlinux.lds
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/s390x/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 9 Apr 2002 17:03:17 -0000 1.2
+++ Makefile 10 Jun 2003 01:46:12 -0000 1.3
@@ -55,6 +55,9 @@
image: vmlinux
@$(MAKEBOOT) image
+install: vmlinux
+ @$(MAKEBOOT) BOOTIMAGE=image install
+
archclean:
@$(MAKEBOOT) clean
Index: config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/s390x/config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.in 9 Apr 2002 17:03:17 -0000 1.2
+++ config.in 10 Jun 2003 01:46:12 -0000 1.3
@@ -71,9 +71,9 @@
comment 'Kernel hacking'
#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
-if [ "$CONFIG_CTC" = "y" ]; then
- bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
-fi
+#if [ "$CONFIG_CTC" = "y" ]; then
+# bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
+#fi
bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
endmenu
Index: defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/s390x/defconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- defconfig 9 Apr 2002 17:03:17 -0000 1.2
+++ defconfig 10 Jun 2003 01:46:12 -0000 1.3
@@ -6,7 +6,7 @@
# CONFIG_MCA is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_GENERIC_BUST_SPINLOCK=n
+# CONFIG_GENERIC_BUST_SPINLOCK is not set
CONFIG_ARCH_S390=y
CONFIG_ARCH_S390X=y
@@ -103,8 +103,8 @@
#
# S/390 tape hardware support
#
-CONFIG_S390_TAPE_3490=y
-CONFIG_S390_TAPE_3480=y
+CONFIG_S390_TAPE_3490=m
+CONFIG_S390_TAPE_3480=m
#
# Network device drivers
@@ -150,6 +150,7 @@
# CONFIG_IPV6_NETLINK is not set
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
+# CONFIG_VLAN_8021Q is not set
#
#
@@ -180,12 +181,12 @@
# CONFIG_AUTOFS4_FS is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADFS_FS_RW is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
-# CONFIG_CMS_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_JBD is not set
# CONFIG_JBD_DEBUG is not set
@@ -203,7 +204,7 @@
# CONFIG_JOLIET is not set
# CONFIG_ZISOFS is not set
# CONFIG_MINIX_FS is not set
-# CONFIG_FREEVXFS_FS is not set
+# CONFIG_VXFS_FS is not set
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS_RW is not set
# CONFIG_HPFS_FS is not set
Index: vmlinux-shared.lds
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/s390x/vmlinux-shared.lds,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vmlinux-shared.lds 9 Apr 2002 17:03:17 -0000 1.1
+++ vmlinux-shared.lds 10 Jun 2003 01:46:12 -0000 1.2
@@ -13,7 +13,6 @@
*(.fixup)
*(.gnu.warning)
} = 0x0700
- .text.lock : { *(.text.lock) } /* out-of-line lock text */
.rodata : { *(.rodata) }
.kstrtab : { *(.kstrtab) }
Index: vmlinux.lds
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/s390x/vmlinux.lds,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vmlinux.lds 9 Apr 2002 17:03:17 -0000 1.2
+++ vmlinux.lds 10 Jun 2003 01:46:12 -0000 1.3
@@ -13,7 +13,6 @@
*(.fixup)
*(.gnu.warning)
} = 0x0700
- .text.lock : { *(.text.lock) } /* out-of-line lock text */
.rodata : { *(.rodata) *(.rodata.*) }
.kstrtab : { *(.kstrtab) }
|
