From 6d889d3386f01f5b4b8616c019f7f6960c3250a3 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 27 Mar 2004 23:13:31 -0800 Subject: [SOC]: Fix cast-as-lvalue warnings in soc fc4 driver. --- drivers/fc4/soc.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/fc4/soc.h b/drivers/fc4/soc.h index c9c6d1d9d959..7015eb7ba795 100644 --- a/drivers/fc4/soc.h +++ b/drivers/fc4/soc.h @@ -114,18 +114,22 @@ static inline u8 xram_get_8 (xram_p x) static inline void xram_copy_from (void *p, xram_p x, int len) { for (len >>= 2; len > 0; len--, x += sizeof(u32)) { - u32 val; + u32 val, *p32 = p; val = ((sbus_readw(x + 0x00UL) << 16) | (sbus_readw(x + 0x02UL))); - *((u32 *)p)++ = val; + *p32++ = val; + p = p32; } } static inline void xram_copy_to (xram_p x, void *p, int len) { for (len >>= 2; len > 0; len--, x += sizeof(u32)) { - u32 tmp = *((u32 *)p)++; + u32 tmp, *p32 = p; + + tmp = *p32++; + p = p32; sbus_writew(tmp >> 16, x + 0x00UL); sbus_writew(tmp, x + 0x02UL); } -- cgit v1.2.3 From 3d5b712833bf43de1badf85b1798c37f64c0be60 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 27 Mar 2004 23:29:47 -0800 Subject: [CARMEL]: Fix 64-bit platform warning. --- drivers/block/carmel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/carmel.c b/drivers/block/carmel.c index 6eae858c1b9d..81819216df9f 100644 --- a/drivers/block/carmel.c +++ b/drivers/block/carmel.c @@ -994,7 +994,8 @@ static void carm_handle_array_info(struct carm_host *host, } printk(KERN_INFO DRV_NAME "(%s): port %u device %Lu sectors\n", - pci_name(host->pdev), port->port_no, port->capacity); + pci_name(host->pdev), port->port_no, + (unsigned long long) port->capacity); printk(KERN_INFO DRV_NAME "(%s): port %u device \"%s\"\n", pci_name(host->pdev), port->port_no, port->name); -- cgit v1.2.3 From 828d856575be28222b92464fab1ed387908b2eb6 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 28 Mar 2004 00:15:44 -0800 Subject: [INTERMEZZO]: Fix 64-bit platform warnings. --- fs/intermezzo/file.c | 6 +++--- fs/intermezzo/fileset.c | 10 ++++++---- fs/intermezzo/journal.c | 4 ++-- fs/intermezzo/kml_reint.c | 10 ++++++---- fs/intermezzo/psdev.c | 8 ++++---- fs/intermezzo/upcall.c | 9 +++++++-- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/fs/intermezzo/file.c b/fs/intermezzo/file.c index 909672a7d431..f6256427b50b 100644 --- a/fs/intermezzo/file.c +++ b/fs/intermezzo/file.c @@ -82,7 +82,7 @@ static int presto_open_upcall(int minor, struct dentry *de) info.remote_generation = dd->remote_generation; } else CERROR("get_fileid failed %d, ino: %Lx, fetching by name\n", rc, - dd->remote_ino); + (unsigned long long) dd->remote_ino); rc = izo_upc_open(minor, pathlen, path, fset->fset_name, &info); PRESTO_FREE(buffer, PAGE_SIZE); @@ -380,7 +380,7 @@ static ssize_t presto_file_write(struct file *file, const char *buf, << file->f_dentry->d_inode->i_sb->s_blocksize_bits); error = presto_reserve_space(fset->fset_cache, res_size); - CDEBUG(D_INODE, "Reserved %Ld for %d\n", res_size, size); + CDEBUG(D_INODE, "Reserved %Ld for %Zd\n", res_size, size); if ( error ) { EXIT; return -ENOSPC; @@ -440,7 +440,7 @@ static ssize_t presto_file_write(struct file *file, const char *buf, fops = filter_c2cffops(cache->cache_filter); res = fops->write(file, buf, size, off); if ( res != size ) { - CDEBUG(D_FILE, "file write returns short write: size %d, res %d\n", size, res); + CDEBUG(D_FILE, "file write returns short write: size %Zd, res %Zd\n", size, res); } if ( (res > 0) && fdata ) diff --git a/fs/intermezzo/fileset.c b/fs/intermezzo/fileset.c index 823c2a4c4d2a..9db8cab514eb 100644 --- a/fs/intermezzo/fileset.c +++ b/fs/intermezzo/fileset.c @@ -647,8 +647,9 @@ int izo_set_fileid(struct file *dir, struct izo_ioctl_data *data) CDEBUG(D_FILE,"de:%p dd:%p\n", dentry, dd); if (dd->remote_ino != 0) { - CERROR("remote_ino already set? %Lx:%Lx\n", dd->remote_ino, - dd->remote_generation); + CERROR("remote_ino already set? %Lx:%Lx\n", + (unsigned long long) dd->remote_ino, + (unsigned long long) dd->remote_generation); rc = 0; EXIT; goto out_close; @@ -656,8 +657,9 @@ int izo_set_fileid(struct file *dir, struct izo_ioctl_data *data) CDEBUG(D_FILE,"setting %p %p, %s to %Lx:%Lx\n", dentry, dd, - buf, data->ioc_ino, - data->ioc_generation); + buf, + (unsigned long long) data->ioc_ino, + (unsigned long long) data->ioc_generation); dd->remote_ino = data->ioc_ino; dd->remote_generation = data->ioc_generation; diff --git a/fs/intermezzo/journal.c b/fs/intermezzo/journal.c index 5e9ff741fe90..2beda3863789 100644 --- a/fs/intermezzo/journal.c +++ b/fs/intermezzo/journal.c @@ -1470,7 +1470,7 @@ int presto_clear_lml_close(struct presto_file_set *fset, loff_t lml_offset) return 0; } - CDEBUG(D_JOURNAL, "reading prefix: off %ld, size %d\n", + CDEBUG(D_JOURNAL, "reading prefix: off %ld, size %Zd\n", (long)lml_offset, sizeof(record)); rc = presto_fread(fset->fset_lml.fd_file, (char *)&record, sizeof(record), &offset); @@ -1621,7 +1621,7 @@ int presto_get_fileid(int minor, struct presto_file_set *fset, /* journal_log_suffix expects journal_log to set this */ suffix->recno = 0; - CDEBUG(D_FILE, "actual kml size: %d\n", logrecord - record); + CDEBUG(D_FILE, "actual kml size: %Zd\n", logrecord - record); CDEBUG(D_FILE, "get fileid: uid %d, gid %d, path: %s\n", uid, gid,path); error = izo_upc_get_fileid(minor, size, record, diff --git a/fs/intermezzo/kml_reint.c b/fs/intermezzo/kml_reint.c index 1ac598457b88..e447b766ed54 100644 --- a/fs/intermezzo/kml_reint.c +++ b/fs/intermezzo/kml_reint.c @@ -162,7 +162,8 @@ static int reint_close(struct kml_rec *rec, struct file *file, */ if (error == ENOENT) { CDEBUG(D_KML, "manually updating remote offset uuid %s" - "recno %d offset %Lu\n", info.uuid, info.recno, info.kml_offset); + "recno %d offset %Lu\n", info.uuid, info.recno, + (unsigned long long) info.kml_offset); error = izo_rcvd_upd_remote(fset, info.uuid, info.recno, info.kml_offset); if(error) CERROR("izo_rcvd_upd_remote error %d\n", error); @@ -528,7 +529,7 @@ int kml_reint_rec(struct file *dir, struct izo_ioctl_data *data) if (rec.suffix->recno != lr_rec.lr_remote_recno + 1) { CERROR("KML record number %Lu expected, not %d\n", - lr_rec.lr_remote_recno + 1, + (unsigned long long) (lr_rec.lr_remote_recno + 1), rec.suffix->recno); #if 0 @@ -631,8 +632,9 @@ int izo_get_fileid(struct file *dir, struct izo_ioctl_data *data) data->ioc_generation = file->f_dentry->d_inode->i_generation; filp_close(file, 0); - CDEBUG(D_FILE, "%s ino %Lx, gen %Lx\n", rec.path, - data->ioc_ino, data->ioc_generation); + CDEBUG(D_FILE, "%s ino %Lx, gen %Lx\n", rec.path, + (unsigned long long) data->ioc_ino, + (unsigned long long) data->ioc_generation); out: if (buf) diff --git a/fs/intermezzo/psdev.c b/fs/intermezzo/psdev.c index ec650c324e19..40a85cc7e837 100644 --- a/fs/intermezzo/psdev.c +++ b/fs/intermezzo/psdev.c @@ -227,7 +227,7 @@ static ssize_t presto_psdev_write(struct file *file, const char *buf, /* move data into response buffer. */ if (req->rq_bufsize < count) { - CERROR("psdev_write: too much cnt: %d, cnt: %d, " + CERROR("psdev_write: too much cnt: %d, cnt: %Zd, " "opc: %d, uniq: %d.\n", req->rq_bufsize, count, hdr.opcode, hdr.unique); count = req->rq_bufsize; /* don't have more space! */ @@ -281,7 +281,7 @@ static ssize_t presto_psdev_read(struct file * file, char * buf, } if (count < req->rq_bufsize) { - CERROR ("psdev_read: buffer too small, read %d of %d bytes\n", + CERROR ("psdev_read: buffer too small, read %Zd of %d bytes\n", count, req->rq_bufsize); } @@ -592,8 +592,8 @@ int izo_upc_upcall(int minor, int *size, struct izo_upcall_hdr *buffer, req->rq_opcode, jiffies - req->rq_posttime, req->rq_unique, req->rq_rep_size); CDEBUG(D_UPCALL, - "..process %d woken up by Lento for req at 0x%x, data at %x\n", - current->pid, (int)req, (int)req->rq_data); + "..process %d woken up by Lento for req at 0x%p, data at %p\n", + current->pid, req, req->rq_data); if (channel->uc_pid) { /* i.e. Lento is still alive */ /* Op went through, interrupt or not we go on */ diff --git a/fs/intermezzo/upcall.c b/fs/intermezzo/upcall.c index e8b6730a3ed7..8019157dd443 100644 --- a/fs/intermezzo/upcall.c +++ b/fs/intermezzo/upcall.c @@ -142,7 +142,10 @@ int izo_upc_kml(int minor, __u64 offset, __u32 first_recno, __u64 length, __u32 CDEBUG(D_UPCALL, "KML: fileset %s, offset %Lu, length %Lu, " "first %u, last %d; minor %d\n", - fsetname, hdr->u_offset, hdr->u_length, hdr->u_first_recno, + fsetname, + (unsigned long long) hdr->u_offset, + (unsigned long long) hdr->u_length, + hdr->u_first_recno, hdr->u_last_recno, minor); error = izo_upc_upcall(minor, &size, hdr, ASYNCHRONOUS); @@ -174,7 +177,9 @@ int izo_upc_kml_truncate(int minor, __u64 length, __u32 last_recno, char *fsetna CDEBUG(D_UPCALL, "KML TRUNCATE: fileset %s, length %Lu, " "last recno %d, minor %d\n", - fsetname, hdr->u_length, hdr->u_last_recno, minor); + fsetname, + (unsigned long long) hdr->u_length, + hdr->u_last_recno, minor); error = izo_upc_upcall(minor, &size, hdr, ASYNCHRONOUS); -- cgit v1.2.3 From 736e44e8b30c085896c3321b4ca9833e5fbfe577 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 29 Mar 2004 22:23:57 -0800 Subject: [SPARC64]: Export prom_palette. --- arch/sparc64/kernel/sparc64_ksyms.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index 79459a13c877..6501896d9472 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c @@ -91,6 +91,7 @@ extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg); extern int (*handle_mathemu)(struct pt_regs *, struct fpustate *); extern long sparc32_open(const char * filename, int flags, int mode); extern int io_remap_page_range(struct vm_area_struct *vma, unsigned long from, unsigned long offset, unsigned long size, pgprot_t prot, int space); +extern void (*prom_palette)(int); extern int __ashrdi3(int, int); @@ -388,3 +389,5 @@ EXPORT_SYMBOL(xor_vis_2); EXPORT_SYMBOL(xor_vis_3); EXPORT_SYMBOL(xor_vis_4); EXPORT_SYMBOL(xor_vis_5); + +EXPORT_SYMBOL(prom_palette); -- cgit v1.2.3