From: Matthew Wilcox <matthew@wil.cx>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: chas3@users.sourceforge.net, Jeff Garzik <jeff@garzik.org>,
Andrew Morton <akpm@osdl.org>,
LKML <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org, kkeil@suse.de, kai.germaschewski@gmx.de,
isdn4linux@listserv.isdn4linux.de, mac@melware.de,
markus.lidel@shadowconnect.com, samuel@sortiz.org,
Neela.Kolli@engenio.com, linux-scsi@vger.kernel.org,
Greg KH <greg@kroah.com>,
thomas@winischhofer.net, ak@suse.de
Subject: Re: [PATCH] Introduce BROKEN_ON_64BIT facility
Date: Mon, 2 Oct 2006 09:18:53 -0600 [thread overview]
Message-ID: <20061002151853.GK16272@parisc-linux.org> (raw)
In-Reply-To: <1159801956.8907.13.camel@localhost.localdomain>
On Mon, Oct 02, 2006 at 04:12:35PM +0100, Alan Cox wrote:
> @@ -1423,14 +1418,15 @@
> printk(KERN_ERR DEV_LABEL "can't allocate DLEs\n");
> goto err_out;
> }
> - iadev->rx_dle_q.start = (struct dle*)dle_addr;
> + iadev->rx_dle_q.start = (struct dle *)dle_addr;
> iadev->rx_dle_q.read = iadev->rx_dle_q.start;
> iadev->rx_dle_q.write = iadev->rx_dle_q.start;
> - iadev->rx_dle_q.end = (struct dle*)((u32)dle_addr+sizeof(struct dle)*DLE_ENTRIES);
> + iadev->rx_dle_q.end = (struct dle*)((unsigned long)dle_addr+sizeof(struct dle)*DLE_ENTRIES);
> /* the end of the dle q points to the entry after the last
> DLE that can be used. */
dle_addr is a bit strange. How about:
+++ b/drivers/atm/iphase.c
@@ -1404,7 +1404,7 @@ static int rx_init(struct atm_dev *dev)
IADEV *iadev;
struct rx_buf_desc __iomem *buf_desc_ptr;
unsigned long rx_pkt_start = 0;
- void *dle_addr;
+ struct dle *dle_addr;
struct abr_vc_table *abr_vc_table;
u16 *vc_table;
u16 *reass_table;
@@ -1423,10 +1423,10 @@ static int rx_init(struct atm_dev *dev)
printk(KERN_ERR DEV_LABEL "can't allocate DLEs\n");
goto err_out;
}
- iadev->rx_dle_q.start = (struct dle*)dle_addr;
+ iadev->rx_dle_q.start = dle_addr;
iadev->rx_dle_q.read = iadev->rx_dle_q.start;
iadev->rx_dle_q.write = iadev->rx_dle_q.start;
- iadev->rx_dle_q.end = (struct dle*)((u32)dle_addr+sizeof(struct dle)*DLE
_ENTRIES);
+ iadev->rx_dle_q.end = dle_addr + DLE_ENTRIES;
/* the end of the dle q points to the entry after the last
DLE that can be used. */
@@ -1884,7 +1884,7 @@ static int tx_init(struct atm_dev *dev)
IADEV *iadev;
struct tx_buf_desc *buf_desc_ptr;
unsigned int tx_pkt_start;
- void *dle_addr;
+ struct dle *dle_addr;
int i;
u_short tcq_st_adr;
u_short *tcq_start;
@@ -1908,10 +1908,10 @@ static int tx_init(struct atm_dev *dev)
printk(KERN_ERR DEV_LABEL "can't allocate DLEs\n");
goto err_out;
}
- iadev->tx_dle_q.start = (struct dle*)dle_addr;
+ iadev->tx_dle_q.start = dle_addr;
iadev->tx_dle_q.read = iadev->tx_dle_q.start;
iadev->tx_dle_q.write = iadev->tx_dle_q.start;
- iadev->tx_dle_q.end = (struct dle*)((u32)dle_addr+sizeof(struct dle)*DLE
_ENTRIES);
+ iadev->tx_dle_q.end = dle_addr + DLE_ENTRIES;
/* write the upper 20 bits of the start address to tx list address regis
ter */
writel(iadev->tx_dle_dma & 0xfffff000,
(whitespace damaged; more for comment than for application).
> - if ((u32)skb->data & 3) {
> + if ((unsigned long)skb->data & 3) {
I suppose it quietens a compiler warning. Doesn't actually fix a bug
though.
next prev parent reply other threads:[~2006-10-02 15:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-02 4:55 [PATCH] Introduce BROKEN_ON_64BIT facility Jeff Garzik
2006-10-02 9:51 ` Andi Kleen
2006-10-02 9:54 ` Jeff Garzik
2006-10-02 14:19 ` Markus Lidel
2006-10-02 13:03 ` Alan Cox
2006-10-02 13:52 ` chas williams - CONTRACTOR
2006-10-02 15:12 ` Alan Cox
2006-10-02 15:18 ` Matthew Wilcox [this message]
2006-10-02 16:21 ` Alan Cox
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=20061002151853.GK16272@parisc-linux.org \
--to=matthew@wil.cx \
--cc=Neela.Kolli@engenio.com \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chas3@users.sourceforge.net \
--cc=greg@kroah.com \
--cc=isdn4linux@listserv.isdn4linux.de \
--cc=jeff@garzik.org \
--cc=kai.germaschewski@gmx.de \
--cc=kkeil@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mac@melware.de \
--cc=markus.lidel@shadowconnect.com \
--cc=netdev@vger.kernel.org \
--cc=samuel@sortiz.org \
--cc=thomas@winischhofer.net \
/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).