Skip to contentSkip to conversation

s390: core changes.

PATCH New Martin Schwidefsky 1 participant 1 message Jan 31, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/8 s390: core changes.

[patch 1/8] s390: core changes.

From: Christian Bornträger <[email protected]>
From: Heiko Carstens <[email protected]>
From: Michael Holzheu <[email protected]>
From: Martin Schwidefsky <[email protected]>

s390 core changes:
- Export arch_pick_mmap_layout as GPL symbol for binfmt_elf32.
- Remove unnecessary include from cmm.
- Allow only root to read the debug feature logs.
- Register all RAM resources, this fixes output of /proc/iomem.
- Add read_can_lock and write_can_lock primitives.
- Regenerate default configuration.

diffstat:

 arch/s390/defconfig         |    7 ++++---
 arch/s390/kernel/debug.c    |    2 +-
 arch/s390/kernel/setup.c    |   44 +++++++++++++++++++++++++++++++++-----------
 arch/s390/mm/cmm.c          |    1 -
 arch/s390/mm/mmap.c         |    3 +++
 include/asm-s390/spinlock.h |   12 ++++++++++++
 6 files changed, 53 insertions(+), 16 deletions(-)
arch/s390/defconfig +4 -3
diff -urN linux-2.6/arch/s390/defconfig linux-2.6-patched/arch/s390/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11-rc1
-# Fri Jan 14 14:56:51 2005
+# Linux kernel version: 2.6.11-rc2
+# Mon Jan 31 16:27:12 2005
 #
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -156,6 +156,7 @@
 #
 # Block devices
 #
+# CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
@@ -579,5 +580,5 @@
 # Library routines
 #
 # CONFIG_CRC_CCITT is not set
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=m
 # CONFIG_LIBCRC32C is not set
arch/s390/kernel/debug.c +1 -1
diff -urN linux-2.6/arch/s390/kernel/debug.c linux-2.6-patched/arch/s390/kernel/debug.c
@@ -931,7 +931,7 @@
 	int rc = 0;
 	int i;
 	unsigned long flags;
-	mode_t mode = S_IFREG;
+	mode_t mode = S_IFREG | S_IRUSR | S_IWUSR;
 	struct proc_dir_entry *pde;
 
 	if (!id)
arch/s390/kernel/setup.c +33 -11

68 lines not on this page · raw message

arch/s390/mm/cmm.c +0 -1
diff -urN linux-2.6/arch/s390/mm/cmm.c linux-2.6-patched/arch/s390/mm/cmm.c
@@ -19,7 +19,6 @@
 
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>
-#include <asm/smp.h>
 
 #include "../../../drivers/s390/net/smsgiucv.h"
 
arch/s390/mm/mmap.c +3 -0
diff -urN linux-2.6/arch/s390/mm/mmap.c linux-2.6-patched/arch/s390/mm/mmap.c
@@ -26,6 +26,7 @@
 
 #include <linux/personality.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 
 /*
  * Top of mmap area (just below the process stack).
@@ -81,3 +82,5 @@
 		mm->unmap_area = arch_unmap_area_topdown;
 	}
 }
+EXPORT_SYMBOL_GPL(arch_pick_mmap_layout);
+
include/asm-s390/spinlock.h +12 -0
diff -urN linux-2.6/include/asm-s390/spinlock.h linux-2.6-patched/include/asm-s390/spinlock.h
@@ -117,6 +117,18 @@
 
 #define rwlock_init(x)	do { *(x) = RW_LOCK_UNLOCKED; } while(0)
 
+/**
+ * read_can_lock - would read_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+#define read_can_lock(x) ((int)(x)->lock >= 0)
+
+/**
+ * write_can_lock - would write_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+#define write_can_lock(x) ((x)->lock == 0)
+
 #ifndef __s390x__
 #define _raw_read_lock(rw)   \
         asm volatile("   l     2,0(%1)\n"   \