These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / tty / goldfish.c

diff --git a/kernel/drivers/tty/goldfish.c b/kernel/drivers/tty/goldfish.c
index 0655fec..0f82c0b 100644 (file)
--- a/kernel/drivers/tty/goldfish.c
+++ b/kernel/drivers/tty/goldfish.c
@@ -59,7 +59,7 @@ static void goldfish_tty_do_write(int line, const char *buf, unsigned count)
        struct goldfish_tty *qtty = &goldfish_ttys[line];
        void __iomem *base = qtty->base;
        spin_lock_irqsave(&qtty->lock, irq_flags);
-       gf_write64((u64)buf, base + GOLDFISH_TTY_DATA_PTR,
+       gf_write_ptr(buf, base + GOLDFISH_TTY_DATA_PTR,
                                base + GOLDFISH_TTY_DATA_PTR_HIGH);
        writel(count, base + GOLDFISH_TTY_DATA_LEN);
        writel(GOLDFISH_TTY_CMD_WRITE_BUFFER, base + GOLDFISH_TTY_CMD);
@@ -81,7 +81,7 @@ static irqreturn_t goldfish_tty_interrupt(int irq, void *dev_id)
 
        count = tty_prepare_flip_string(&qtty->port, &buf, count);
        spin_lock_irqsave(&qtty->lock, irq_flags);
-       gf_write64((u64)buf, base + GOLDFISH_TTY_DATA_PTR,
+       gf_write_ptr(buf, base + GOLDFISH_TTY_DATA_PTR,
                                base + GOLDFISH_TTY_DATA_PTR_HIGH);
        writel(count, base + GOLDFISH_TTY_DATA_LEN);
        writel(GOLDFISH_TTY_CMD_READ_BUFFER, base + GOLDFISH_TTY_CMD);