From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: linux-kernel@vger.kernel.org, torvalds@transmeta.com
Subject: [PATCH] 2.5.34 s390 fixes (2/10): common code changes.
Date: Wed, 11 Sep 2002 18:07:23 +0200 [thread overview]
Message-ID: <200209111800.25369.schwidefsky@de.ibm.com> (raw)
Hi Linus,
the common code changes for s390:
1) correct includes in ibm.c to make it compile.
2) do not create /proc/interrupts for s390.
3) remove call to s390_init_machine_check in init/main.c
blues skies,
Martin.
diff -urN linux-2.5.34/fs/partitions/ibm.c linux-2.5.34-s390/fs/partitions/ibm.c
--- linux-2.5.34/fs/partitions/ibm.c Mon Sep 9 19:35:28 2002
+++ linux-2.5.34-s390/fs/partitions/ibm.c Tue Sep 10 20:25:48 2002
@@ -12,23 +12,16 @@
*/
#include <linux/config.h>
-#include <linux/fs.h>
-#include <linux/genhd.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/string.h>
-#include <linux/blk.h>
-#include <linux/slab.h>
+#include <linux/buffer_head.h>
#include <linux/hdreg.h>
-#include <linux/ioctl.h>
-#include <linux/version.h>
+#include <linux/slab.h>
+#include <asm/dasd.h>
#include <asm/ebcdic.h>
#include <asm/uaccess.h>
-#include <asm/dasd.h>
+#include <asm/vtoc.h>
-#include "ibm.h"
#include "check.h"
-#include <asm/vtoc.h>
+#include "ibm.h"
/*
* compute the block number from a
diff -urN linux-2.5.34/fs/proc/proc_misc.c linux-2.5.34-s390/fs/proc/proc_misc.c
--- linux-2.5.34/fs/proc/proc_misc.c Mon Sep 9 19:35:03 2002
+++ linux-2.5.34-s390/fs/proc/proc_misc.c Tue Sep 10 20:25:48 2002
@@ -411,6 +411,7 @@
return proc_calc_metrics(page, start, off, count, eof, len);
}
+#if !defined(CONFIG_ARCH_S390)
extern int show_interrupts(struct seq_file *p, void *v);
static int interrupts_open(struct inode *inode, struct file *file)
{
@@ -440,6 +441,7 @@
llseek: seq_lseek,
release: single_release,
};
+#endif
static int filesystems_read_proc(char *page, char **start, off_t off,
int count, int *eof, void *data)
@@ -622,7 +624,9 @@
entry->proc_fops = &proc_kmsg_operations;
create_seq_entry("cpuinfo", 0, &proc_cpuinfo_operations);
create_seq_entry("partitions", 0, &proc_partitions_operations);
+#if !defined(CONFIG_ARCH_S390)
create_seq_entry("interrupts", 0, &proc_interrupts_operations);
+#endif
create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations);
#ifdef CONFIG_MODULES
create_seq_entry("modules", 0, &proc_modules_operations);
diff -urN linux-2.5.34/init/main.c linux-2.5.34-s390/init/main.c
--- linux-2.5.34/init/main.c Mon Sep 9 19:35:04 2002
+++ linux-2.5.34-s390/init/main.c Tue Sep 10 20:25:48 2002
@@ -503,13 +503,6 @@
sysctl_init();
#endif
- /*
- * Ok, at this point all CPU's should be initialized, so
- * we can start looking into devices..
- */
-#if defined(CONFIG_ARCH_S390)
- s390_init_machine_check();
-#endif
/* Networking initialization needs a process context */
sock_init();
reply other threads:[~2002-09-11 16:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200209111800.25369.schwidefsky@de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).