From: jbarnes@sgi.com (Jesse Barnes)
To: linux-ia64@vger.kernel.org
Subject: [PATCH] fix misc. sn2 warnings
Date: Thu, 11 Mar 2004 22:11:49 +0000 [thread overview]
Message-ID: <20040311221149.GA17986@sgi.com> (raw)
This patch fixes a few warnings that have cropped up in the sn2 code:
- hwgfs function prototype mismatch
- pconn uninitialized in pciio.c
- printk formatting fixes in pcibr_dvr.c
- interrupt fixes (extra volatile qualifier and prototype/use
mismatch)
Jesse
=== arch/ia64/sn/io/hwgfs/ramfs.c 1.4 vs edited ==--- 1.4/arch/ia64/sn/io/hwgfs/ramfs.c Sun Jan 18 22:36:01 2004
+++ edited/arch/ia64/sn/io/hwgfs/ramfs.c Thu Mar 11 13:08:55 2004
@@ -84,7 +84,7 @@
return hwgfs_mknod(dir, dentry, mode | S_IFDIR, 0);
}
-static int hwgfs_create(struct inode *dir, struct dentry *dentry, int mode)
+static int hwgfs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *unused)
{
return hwgfs_mknod(dir, dentry, mode | S_IFREG, 0);
}
=== arch/ia64/sn/io/sn2/pciio.c 1.15 vs edited ==--- 1.15/arch/ia64/sn/io/sn2/pciio.c Fri Feb 6 00:30:16 2004
+++ edited/arch/ia64/sn/io/sn2/pciio.c Thu Mar 11 13:08:56 2004
@@ -822,7 +822,7 @@
pciio_info_t pciio_info)
{
char name[32];
- vertex_hdl_t pconn;
+ vertex_hdl_t pconn = NULL;
if (!pciio_info)
return;
@@ -835,7 +835,6 @@
hwgraph_vertex_unref(pconn);
hwgraph_vertex_destroy(pconn);
-
}
/*ARGSUSED */
=== arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c 1.29 vs edited ==--- 1.29/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c Thu Feb 19 09:12:31 2004
+++ edited/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c Thu Mar 11 13:08:56 2004
@@ -2501,7 +2501,7 @@
if (pcibr_soft->bs_pcix_num_funcs) {
if (pcibr_soft->bs_pcix_num_funcs > NUM_RBAR) {
printk(KERN_WARNING
- "%lx: Must oversubscribe Read Buffer Attribute Registers"
+ "%s: Must oversubscribe Read Buffer Attribute Registers"
"(RBAR). Bus has %d RBARs but %d funcs need them.\n",
pcibr_soft->bs_name, NUM_RBAR, pcibr_soft->bs_pcix_num_funcs);
percent_allowed = 0;
@@ -2603,7 +2603,7 @@
memset(buffer, 0, 1024);
vsnprintf(buffer, 1024, format, ap);
va_end(ap);
- printk("", "%s", buffer);
+ printk("%s", buffer);
kfree(buffer);
}
}
=== arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c 1.17 vs edited ==--- 1.17/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c Fri Feb 13 07:00:22 2004
+++ edited/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c Thu Mar 11 13:08:56 2004
@@ -101,7 +101,7 @@
{
nasid_t nasid;
int wid_num;
- volatile struct sn_flush_device_list *p;
+ struct sn_flush_device_list *p;
int i,j;
int bwin;
unsigned long flags;
=== arch/ia64/sn/kernel/irq.c 1.20 vs edited ==--- 1.20/arch/ia64/sn/kernel/irq.c Thu Feb 26 09:51:09 2004
+++ edited/arch/ia64/sn/kernel/irq.c Thu Mar 11 13:24:19 2004
@@ -118,9 +118,10 @@
}
static void
-sn_set_affinity_irq(unsigned int irq, unsigned long cpu)
+sn_set_affinity_irq(unsigned int irq, cpumask_t dest)
{
#ifdef CONFIG_SMP
+ unsigned long cpu = first_cpu(dest);
int redir = 0;
struct sn_intr_list_t *p = sn_intr_list[irq];
pcibr_intr_t intr;
@@ -147,7 +148,7 @@
sn_shutdown_irq,
sn_enable_irq,
sn_disable_irq,
- sn_ack_irq,
+ sn_ack_irq,
sn_end_irq,
sn_set_affinity_irq
};
next reply other threads:[~2004-03-11 22:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-11 22:11 Jesse Barnes [this message]
2004-03-12 0:32 ` [PATCH] fix misc. sn2 warnings Jesse Barnes
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=20040311221149.GA17986@sgi.com \
--to=jbarnes@sgi.com \
--cc=linux-ia64@vger.kernel.org \
/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