Re: [PATCH] SGIWD93: use cached memory access to make driver work on IP28
On Mon, Nov 26, 2007 at 06:41:15PM +0100, Thomas Bogendoerfer wrote: > Following patch is 2.6.25 material needed to get SGI IP28 machines > supported. > > Thomas. > > SGI IP28 machines would need special treatment (enable adding addtional > wait states) when accessing memory uncached. To avoid this pain I > changed the driver to use only cached access to memory. > > Signed-off-by: Thomas Bogendoerfer <[EMAIL PROTECTED]> Same comment as for SGISEEQ: IP28 is clearly a maximum weirdo beast. Technically the patch looks fine it's just a few stilistic issues such as there no reason for DMA_SYNC_DESC_CPU and DMA_SYNC_DESC_DEV being macros so why not using inlines. Acked-by: Ralf Baechle <[EMAIL PROTECTED]> Ralf - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [UPDATED PATCH] SGIWD93: use cached memory access to make driver work on IP28
On Sun, Dec 02, 2007 at 11:33:09AM +0100, Thomas Bogendoerfer wrote: > SGI IP28 machines would need special treatment (enable adding addtional > wait states) when accessing memory uncached. To avoid this pain I > changed the driver to use only cached access to memory. > > Signed-off-by: Thomas Bogendoerfer <[EMAIL PROTECTED]> Acked-by: Ralf Baechle <[EMAIL PROTECTED]> The machine really is as insane as Thomas makes it sound. Actually even more so. Ralf - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 3/3] scsi: wd33c93 needs
On Fri, Jul 20, 2007 at 06:40:46PM +0200, Geert Uytterhoeven wrote: > --- a/drivers/scsi/wd33c93.c > +++ b/drivers/scsi/wd33c93.c > @@ -89,6 +89,8 @@ > #include > #include > > +#include These days that should probably be . Ralf - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 3/3] scsi: wd33c93 needs
On Fri, Jul 20, 2007 at 06:33:59PM +0100, Christoph Hellwig wrote: > On Fri, Jul 20, 2007 at 06:31:32PM +0100, Ralf Baechle wrote: > > > +#include > > > > These days that should probably be . > > Not at all, linux/irq.h is something entirely different. Well, fine. But checkpatch.pl will bitch about this and other files. So one way or the other it's not quite kosher. Ralf - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/9] define global BIT macro
On Sat, Aug 18, 2007 at 11:44:12AM +0200, Jiri Slaby wrote: > define global BIT macro > > move all local BIT defines to the new globally define macro. > > Signed-off-by: Jiri Slaby <[EMAIL PROTECTED]> Acked-by: Ralf Baechle <[EMAIL PROTECTED]> for the MACE ethernet and MIPS bits. Ralf - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 5/59] sysctl: rose remove unnecessary insert_at_head flag
On Tue, Jan 16, 2007 at 09:39:10AM -0700, Eric W. Biederman wrote: Looks ok, for these: Subject: [PATCH 5/59] sysctl: rose remove unnecessary insert_at_head flag Subject: [PATCH 6/59] sysctl: netrom remove unnecessary insert_at_head flag Subject: [PATCH 11/59] sysctl: ax25 remove unnecessary insert_at_head flag Subject: [PATCH 30/59] sysctl: mips/au1000 Remove sys_sysctl support Subject: [PATCH 31/59] sysctl: C99 convert the ctl_tables in arch/mips/au1000/common/power.c Subject: [PATCH 32/59] sysctl: C99 convert arch/mips/lasat/sysctl.c and remove ABI breakage. Subject: [PATCH 43/59] sysctl: Remove sys_sysctl support from drivers/char/rtc.c Subject: [PATCH 55/59] sysctl: Remove insert_at_head from register_sysctl Acked-by: Ralf Baechle <[EMAIL PROTECTED]> Ralf - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: gdth new set of patches for 2.6.24 stable
On Mon, Feb 18, 2008 at 04:57:36AM -0800, Andrew Morton wrote:
> On Sun, 17 Feb 2008 18:46:03 +0200 Boaz Harrosh <[EMAIL PROTECTED]> wrote:
>
> > ...
> >
> > All my testers have reported back that with these 5 patches applied they can
> > now run with a 2.6.24 kernel the same way they ran before. However there is
> > that reported issue, with the dma_free_coherent WARN_ON (above). The code
> > was
> > like that from day one and it is a very old issue, however it is a
> > regression
> > because 2.6.24 introduced that new WARN_ON.
> > (infamous commit aa24886e379d2b641c5117e178b15ce1d5d366ba)
> > >From posts on lkml and even recent one in linux-scsi about the arcmsr
> > >driver
> > it looks that all a driver can do is work around it with different kernel
> > mechanisms
> > and driver rewrites. I'm afraid I need your help here. I'm not sure I
> > understand
> > why does the gdth driver uses the pci_{alloc,free}_consistent() API's, and
> > what
> > is needed to replace it. Could you please have a look in gdth_proc.c and
> > also in
> > gdth.c for all the places that call gdth_ioctl_alloc/gdth_ioctl_free, and
> > advise
> > what can I do in it's place. Please bear in mind that we need it for
> > 2.6.24, as
> > a bugfix.
> >
> > Apart from the above issue, please accept patches 3,4,5 above they have now
> > been tested and are reported to bring broken system back to production.
> > (Given that you approve off course). And mark them for inclusion to the
> > 2.6.24 stable releases. (Or is there some thing that I should do)
> >
> > ---
> > Meanwhile on x86 systems I understand the WARN_ON is cosmetic, and does not
> > pose any harm. Some people have reported stability with temporarily
> > disabling
> > it. For testers that want to try, here it is below. At your own risk.
> >
> > ---
> > >From 50d3657bf6a138ee63ad1ce00052380edc75ace7 Mon Sep 17 00:00:00 2001
> > From: Boaz Harrosh <[EMAIL PROTECTED]>
> > Date: Sun, 17 Feb 2008 12:49:35 +0200
> > Subject: [PATCH] gdth: Hack to remove WARN_ON in
> > arch/x86/kernel/pci-dma_32.c
> >
> > gdth uses dma_free_coherent() with interrupts disabled. Which
> > is not portable, but is safe on the HW that supports gdth.
> >
> > NOT Signed-off-by: Boaz Harrosh <[EMAIL PROTECTED]>
> > ---
> > arch/x86/kernel/pci-dma_32.c |2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/x86/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c
> > index 5133032..350dcfd 100644
> > --- a/arch/x86/kernel/pci-dma_32.c
> > +++ b/arch/x86/kernel/pci-dma_32.c
> > @@ -63,7 +63,7 @@ void dma_free_coherent(struct device *dev, size_t size,
> > struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
> > int order = get_order(size);
> >
> > - WARN_ON(irqs_disabled()); /* for portability */
> > +/* WARN_ON(irqs_disabled());*/ /* for portability */
> > if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base +
> > (mem->size << PAGE_SHIFT))) {
> > int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
> >
>
> Yes. Let's reprise aa24886e379d2b641c5117e178b15ce1d5d366ba:
>
> : commit aa24886e379d2b641c5117e178b15ce1d5d366ba
> : Author: David Brownell <[EMAIL PROTECTED]>
> : Date: Fri Aug 10 13:10:27 2007 -0700
> :
> : dma_free_coherent() needs irqs enabled (sigh)
> :
> : On at least ARM (and I'm told MIPS too) dma_free_coherent() has a newish
> : call context requirement: unlike its dma_alloc_coherent() sibling, it
> may
> : not be called with IRQs disabled. (This was new behavior on ARM as of
> late
> : 2005, caused by ARM SMP updates.) This little surprise can be annoyingly
> : driver-visible.
> :
> : Since it looks like that restriction won't be removed, this patch
> changes
> : the definition of the API to include that requirement. Also, to help
> catch
> : nonportable drivers, it updates the x86 and swiotlb versions to include
> the
> : relevant warnings. (I already observed that it trips on the
> : bus_reset_tasklet of the new firewire_ohci driver.)
> :
>
> In general, all Linux memory-freeing functions can be called from all
> contexts. (vfree is an irritating exception). This is good, and provides
> maximum usefulness to callees, as all utility functions should seek to do.
> It would be best to fix arm and mips.
>
> But arm and mips require enabled local irqs because their
> dma_free_coherent() needs to do a cross-cpu IPI call. Presumably because
> of certain unusual TLB protocols.
>
> I'm not sure what we should do about this. Presumably the gdth-on-arm
> usage base is, umm, zero, so we could lamely add
> CONFIG_DMA_FREE_COHERENT_WITH_LOCAL_IRQS_DISABLED_IS_OK and then use that
> to disable gdth (and similar) on arm amd mips. But ugh.
>
> Russell, Ralf: is there something we can do here to relax this requirement?
The current MIPS implementation of dma_alloc_coherent / dma_free_coherent
is a glorified wrapper around __get
Re: gdth new set of patches for 2.6.24 stable
On Mon, Feb 18, 2008 at 12:27:42PM -0800, David Brownell wrote: > > Actually I think David might have been wrong about mips. afaict its > > dma_free_coherent() is callable under local_irq_disable(), so ARM SMP is > > the sole exception? > > All I recall at this point was getting some arch-specific patches in that > area; I thought it was MIPS, maybe it was PPC. The arch code may have > changed since then too. Mostly to avoid code duplication on the MIPS side but the core of the implementation has always been similar to what it is currently. Ralf - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 09/13] timer: Remove users of expire and data arguments to DEFINE_TIMER
On Wed, Oct 04, 2017 at 04:27:03PM -0700, Kees Cook wrote: > Subject: [PATCH 09/13] timer: Remove users of expire and data arguments to > DEFINE_TIMER > > The expire and data arguments of DEFINE_TIMER are only used in two places > and are ignored by the code (malta-display.c only uses mod_timer(), > never add_timer(), so the preset expires value is ignored). Set both > sets of arguments to zero. > > Cc: Ralf Baechle > Cc: Wim Van Sebroeck > Cc: Guenter Roeck > Cc: Geert Uytterhoeven > Cc: linux-m...@linux-mips.org > Cc: linux-watch...@vger.kernel.org > Signed-off-by: Kees Cook > --- > arch/mips/mti-malta/malta-display.c | 6 +++--- > drivers/watchdog/alim7101_wdt.c | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) For malta-display: Acked-by: Ralf Baechle Ralf
Re: [PATCH 10/13] timer: Remove expires and data arguments from DEFINE_TIMER
On Wed, Oct 04, 2017 at 04:27:04PM -0700, Kees Cook wrote: > Subject: [PATCH 10/13] timer: Remove expires and data arguments from > DEFINE_TIMER > > Drop the arguments from the macro and adjust all callers with the > following script: > > perl -pi -e 's/DEFINE_TIMER\((.*), 0, 0\);/DEFINE_TIMER($1);/g;' \ > $(git grep DEFINE_TIMER | cut -d: -f1 | sort -u | grep -v timer.h) > > Signed-off-by: Kees Cook > Acked-by: Geert Uytterhoeven # for m68k parts > --- > arch/arm/mach-ixp4xx/dsmg600-setup.c | 2 +- > arch/arm/mach-ixp4xx/nas100d-setup.c | 2 +- > arch/m68k/amiga/amisound.c| 2 +- > arch/m68k/mac/macboing.c | 2 +- > arch/mips/mti-malta/malta-display.c | 2 +- > arch/parisc/kernel/pdc_cons.c | 2 +- > arch/s390/mm/cmm.c| 2 +- > drivers/atm/idt77105.c| 4 ++-- > drivers/atm/iphase.c | 2 +- > drivers/block/ataflop.c | 8 > drivers/char/dtlk.c | 2 +- > drivers/char/hangcheck-timer.c| 2 +- > drivers/char/nwbutton.c | 2 +- > drivers/char/rtc.c| 2 +- > drivers/input/touchscreen/s3c2410_ts.c| 2 +- > drivers/net/cris/eth_v10.c| 6 +++--- > drivers/net/hamradio/yam.c| 2 +- > drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- > drivers/staging/speakup/main.c| 2 +- > drivers/staging/speakup/synth.c | 2 +- > drivers/tty/cyclades.c| 2 +- > drivers/tty/isicom.c | 2 +- > drivers/tty/moxa.c| 2 +- > drivers/tty/rocket.c | 2 +- > drivers/tty/vt/keyboard.c | 2 +- > drivers/tty/vt/vt.c | 2 +- > drivers/watchdog/alim7101_wdt.c | 2 +- > drivers/watchdog/machzwd.c| 2 +- > drivers/watchdog/mixcomwd.c | 2 +- > drivers/watchdog/sbc60xxwdt.c | 2 +- > drivers/watchdog/sc520_wdt.c | 2 +- > drivers/watchdog/via_wdt.c| 2 +- > drivers/watchdog/w83877f_wdt.c| 2 +- > drivers/xen/grant-table.c | 2 +- > fs/pstore/platform.c | 2 +- > include/linux/timer.h | 4 ++-- > kernel/irq/spurious.c | 2 +- > lib/random32.c| 2 +- > net/atm/mpc.c | 2 +- > net/decnet/dn_route.c | 2 +- > net/ipv6/ip6_flowlabel.c | 2 +- > net/netrom/nr_loopback.c | 2 +- > security/keys/gc.c| 2 +- > sound/oss/midibuf.c | 2 +- > sound/oss/soundcard.c | 2 +- > sound/oss/sys_timer.c | 2 +- > sound/oss/uart6850.c | 2 +- > 47 files changed, 54 insertions(+), 54 deletions(-) Acked-by: Ralf Baechle Thanks, Ralf
[PATCH] Remove IP27 hacks in qlogicisp driver
Now that the qla1280 driver is working on IP27 there is no more point
in keeping the old hacks around that were introduced in 1999. One
nail more in the coffin of this driver.
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
arch/mips/Kconfig|4 -
arch/mips/configs/ip27_defconfig |1
drivers/scsi/qlogicisp.c | 86 ---
3 files changed, 91 deletions(-)
Index: linux-sgi-ip27-ua/drivers/scsi/qlogicisp.c
===
--- linux-sgi-ip27-ua.orig/drivers/scsi/qlogicisp.c 2005-07-15
18:13:44.0 +0200
+++ linux-sgi-ip27-ua/drivers/scsi/qlogicisp.c 2005-07-15 18:13:48.0
+0200
@@ -192,14 +192,8 @@
#define REQUEST_QUEUE_WAKEUP 0x8005
#define EXECUTION_TIMEOUT_RESET0x8006
-#ifdef CONFIG_QL_ISP_A64
-#define IOCB_SEGS 2
-#define CONTINUATION_SEGS 5
-#define MAX_CONTINUATION_ENTRIES254
-#else
#define IOCB_SEGS 4
#define CONTINUATION_SEGS 7
-#endif /* CONFIG_QL_ISP_A64 */
struct Entry_header {
u_char entry_type;
@@ -209,13 +203,8 @@
};
/* entry header type commands */
-#ifdef CONFIG_QL_ISP_A64
-#define ENTRY_COMMAND 9
-#define ENTRY_CONTINUATION 0xa
-#else
#define ENTRY_COMMAND 1
#define ENTRY_CONTINUATION 2
-#endif /* CONFIG_QL_ISP_A64 */
#define ENTRY_STATUS 3
#define ENTRY_MARKER 4
@@ -229,9 +218,6 @@
struct dataseg {
u_int d_base;
-#ifdef CONFIG_QL_ISP_A64
- u_int d_base_hi;
-#endif
u_int d_count;
};
@@ -246,10 +232,6 @@
u_short time_out;
u_short segment_cnt;
u_char cdb[12];
-#ifdef CONFIG_QL_ISP_A64
- u_int rsvd1;
- u_int rsvd2;
-#endif
struct dataseg dataseg[IOCB_SEGS];
};
@@ -277,9 +259,7 @@
struct Continuation_Entry {
struct Entry_header hdr;
-#ifndef CONFIG_QL_ISP_A64
u_int reserved;
-#endif
struct dataseg dataseg[CONTINUATION_SEGS];
};
@@ -424,11 +404,6 @@
#define MBOX_WRITE_FOUR_RAM_WORDS 0x0041
#define MBOX_EXEC_BIOS_IOCB0x0042
-#ifdef CONFIG_QL_ISP_A64
-#define MBOX_CMD_INIT_REQUEST_QUEUE_64 0x0052
-#define MBOX_CMD_INIT_RESPONSE_QUEUE_64 0x0053
-#endif /* CONFIG_QL_ISP_A64 */
-
#include "qlogicisp_asm.c"
#define PACKB(a, b)(((a)<<4)|(b))
@@ -501,25 +476,6 @@
PACKB(1, 2),/* MBOX_RETURN_BIOS_BLOCK_ADDR */
PACKB(6, 1),/* MBOX_WRITE_FOUR_RAM_WORDS */
PACKB(2, 3) /* MBOX_EXEC_BIOS_IOCB */
-#ifdef CONFIG_QL_ISP_A64
- ,PACKB(0, 0), /* 0x0043 */
- PACKB(0, 0),/* 0x0044 */
- PACKB(0, 0),/* 0x0045 */
- PACKB(0, 0),/* 0x0046 */
- PACKB(0, 0),/* 0x0047 */
- PACKB(0, 0),/* 0x0048 */
- PACKB(0, 0),/* 0x0049 */
- PACKB(0, 0),/* 0x004a */
- PACKB(0, 0),/* 0x004b */
- PACKB(0, 0),/* 0x004c */
- PACKB(0, 0),/* 0x004d */
- PACKB(0, 0),/* 0x004e */
- PACKB(0, 0),/* 0x004f */
- PACKB(0, 0),/* 0x0050 */
- PACKB(0, 0),/* 0x0051 */
- PACKB(8, 8),/* MBOX_CMD_INIT_REQUEST_QUEUE_64 (0x0052) */
- PACKB(8, 8) /* MBOX_CMD_INIT_RESPONSE_QUEUE_64 (0x0053) */
-#endif /* CONFIG_QL_ISP_A64 */
};
#define MAX_MBOX_COMMAND (sizeof(mbox_param)/sizeof(u_short))
@@ -888,9 +844,6 @@
for (i = 0; i < n; i++) {
dma_addr = sg_dma_address(sg);
ds[i].d_base = cpu_to_le32((u32) dma_addr);
-#ifdef CONFIG_QL_ISP_A64
- ds[i].d_base_hi = cpu_to_le32((u32) (dma_addr>>32));
-#endif /* CONFIG_QL_ISP_A64 */
ds[i].d_count = cpu_to_le32(sg_dma_len(sg));
++sg;
}
@@ -911,9 +864,7 @@
cont->hdr.entry_cnt = 0;
cont->hdr.sys_def_1 = 0;
cont->hdr.flags = 0;
-#ifndef CONFIG_QL_ISP_A64
cont->reserved = 0;
-#endif
ds = cont->dataseg;
n = sg_count;
if (n > CONTINUATION_SEGS)
@@ -921,9 +872,6 @@
for (i = 0; i < n; ++i) {
dma_addr = sg_dma_address(sg);
ds[i].d_base = cpu_to_le32((u32) dma_addr);
-#ifdef CONFIG_QL_ISP_A64
- ds[i].d_base_hi =
cpu_to_le32((u32)(dma_addr>>32));
-#endif /* CONFIG_QL_ISP_A64 */
ds[i].d_count = cpu_to_le32(sg_dma_len(sg));
[PATCH] Pass struct dev pointer to dma_cache_sync()
So following the previous patch to pass a struct dev pointer to
dma_is_consistent() there is still dma_cache_sync left which does not
receive a dev pointer.
Ralf
-
Pass struct dev pointer to dma_cache_sync()
dma_cache_sync() is ill-designed in that it does not have a struct
device pointer argument which makes proper support for systems that consist
of a mix of coherent and non-coherent DMA devices hard. Change
dma_cache_sync to take a struct device pointer as first argument and fix
all its callers to pass it.
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
Documentation/DMA-API.txt |2 -
arch/avr32/mm/dma-coherent.c |2 -
arch/mips/mm/dma-coherent.c |2 -
arch/mips/mm/dma-ip27.c |2 -
arch/mips/mm/dma-ip32.c |3 +
arch/mips/mm/dma-noncoherent.c|3 +
drivers/net/lasi_82596.c | 94 +++--
drivers/scsi/53c700.c | 80 +--
drivers/scsi/53c700.h | 16 +++---
drivers/serial/mpsc.c | 22 -
include/asm-alpha/dma-mapping.h |2 -
include/asm-avr32/dma-mapping.h |3 +
include/asm-cris/dma-mapping.h|2 -
include/asm-frv/dma-mapping.h |2 -
include/asm-generic/dma-mapping.h |2 -
include/asm-i386/dma-mapping.h|2 -
include/asm-ia64/dma-mapping.h|3 +
include/asm-m68k/dma-mapping.h|2 -
include/asm-mips/dma-mapping.h|2 -
include/asm-parisc/dma-mapping.h |2 -
include/asm-powerpc/dma-mapping.h |2 -
include/asm-sh/dma-mapping.h |2 -
include/asm-sh64/dma-mapping.h|2 -
include/asm-sparc64/dma-mapping.h |2 -
include/asm-um/dma-mapping.h |2 -
include/asm-x86_64/dma-mapping.h |3 +
include/asm-xtensa/dma-mapping.h |2 -
27 files changed, 137 insertions(+), 126 deletions(-)
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index 6e826f4..b3dafd5 100644
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -459,7 +459,7 @@ anything like this. You must also be ex
memory you intend to sync partially.
void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
Do a partial sync of memory that was allocated by
diff --git a/arch/avr32/mm/dma-coherent.c b/arch/avr32/mm/dma-coherent.c
index 44ab8a7..b68d669 100644
--- a/arch/avr32/mm/dma-coherent.c
+++ b/arch/avr32/mm/dma-coherent.c
@@ -11,7 +11,7 @@ #include
#include
#include
-void dma_cache_sync(void *vaddr, size_t size, int direction)
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size, int
direction)
{
/*
* No need to sync an uncached area
diff --git a/arch/mips/mm/dma-coherent.c b/arch/mips/mm/dma-coherent.c
index 18bc83e..5697c6e 100644
--- a/arch/mips/mm/dma-coherent.c
+++ b/arch/mips/mm/dma-coherent.c
@@ -197,7 +197,7 @@ int dma_is_consistent(struct device *dev
EXPORT_SYMBOL(dma_is_consistent);
-void dma_cache_sync(void *vaddr, size_t size,
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
diff --git a/arch/mips/mm/dma-ip27.c b/arch/mips/mm/dma-ip27.c
index 8e9a5a8..f088344 100644
--- a/arch/mips/mm/dma-ip27.c
+++ b/arch/mips/mm/dma-ip27.c
@@ -204,7 +204,7 @@ int dma_is_consistent(struct device *dev
EXPORT_SYMBOL(dma_is_consistent);
-void dma_cache_sync(void *vaddr, size_t size,
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
diff --git a/arch/mips/mm/dma-ip32.c b/arch/mips/mm/dma-ip32.c
index 08720a4..b42b6f7 100644
--- a/arch/mips/mm/dma-ip32.c
+++ b/arch/mips/mm/dma-ip32.c
@@ -370,7 +370,8 @@ int dma_is_consistent(struct device *dev
EXPORT_SYMBOL(dma_is_consistent);
-void dma_cache_sync(void *vaddr, size_t size, enum dma_data_direction
direction)
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+ enum dma_data_direction direction)
{
if (direction == DMA_NONE)
return;
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c
index 4a3efc6..8cecef0 100644
--- a/arch/mips/mm/dma-noncoherent.c
+++ b/arch/mips/mm/dma-noncoherent.c
@@ -306,7 +306,8 @@ int dma_is_consistent(struct device *dev
EXPORT_SYMBOL(dma_is_consistent);
-void dma_cache_sync(void *vaddr, size_t size, enum dma_data_direction
direction)
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+ enum dma_data_direction direction)
{
if (direction == DMA_NONE)
return;
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index f4d815b..ea392f2 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -119,14 +119,14 @@ #define D
