Commit c4328b65 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] macserial build fix

`current' is a lousy choice for a variable name.  This driver explodes on
ppc64 because `current' expands to (local_paca->__current).

OK, the driver doesn't compile on power4 anyway, but...

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c7cd6a3f
...@@ -155,7 +155,7 @@ static void dbdma_flush(volatile struct dbdma_regs *dma); ...@@ -155,7 +155,7 @@ static void dbdma_flush(volatile struct dbdma_regs *dma);
static irqreturn_t rs_txdma_irq(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t rs_txdma_irq(int irq, void *dev_id, struct pt_regs *regs);
static irqreturn_t rs_rxdma_irq(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t rs_rxdma_irq(int irq, void *dev_id, struct pt_regs *regs);
static void dma_init(struct mac_serial * info); static void dma_init(struct mac_serial * info);
static void rxdma_start(struct mac_serial * info, int current); static void rxdma_start(struct mac_serial * info, int curr);
static void rxdma_to_tty(struct mac_serial * info); static void rxdma_to_tty(struct mac_serial * info);
/* /*
...@@ -762,10 +762,10 @@ static int startup(struct mac_serial * info) ...@@ -762,10 +762,10 @@ static int startup(struct mac_serial * info)
return 0; return 0;
} }
static _INLINE_ void rxdma_start(struct mac_serial * info, int current) static _INLINE_ void rxdma_start(struct mac_serial * info, int curr)
{ {
volatile struct dbdma_regs *rd = &info->rx->dma; volatile struct dbdma_regs *rd = &info->rx->dma;
volatile struct dbdma_cmd *cd = info->rx_cmds[current]; volatile struct dbdma_cmd *cd = info->rx_cmds[curr];
//printk(KERN_DEBUG "SCC: rxdma_start\n"); //printk(KERN_DEBUG "SCC: rxdma_start\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment