projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
hvc
/
hvc_xen.c
diff --git
a/drivers/tty/hvc/hvc_xen.c
b/drivers/tty/hvc/hvc_xen.c
index 10beb1589d8340fb0d0c5965a53cca5abf0b75f7..fa816b7193b6af9f823a74320588cb5f1c7bafde 100644
(file)
--- a/
drivers/tty/hvc/hvc_xen.c
+++ b/
drivers/tty/hvc/hvc_xen.c
@@
-230,7
+230,7
@@
static int xen_hvm_console_init(void)
if (r < 0 || v == 0)
goto err;
gfn = v;
if (r < 0 || v == 0)
goto err;
gfn = v;
- info->intf = xen_remap(gfn <<
PAGE_SHIFT,
PAGE_SIZE);
+ info->intf = xen_remap(gfn <<
XEN_PAGE_SHIFT, XEN_
PAGE_SIZE);
if (info->intf == NULL)
goto err;
info->vtermno = HVC_COOKIE;
if (info->intf == NULL)
goto err;
info->vtermno = HVC_COOKIE;
@@
-472,7
+472,7
@@
static int xencons_resume(struct xenbus_device *dev)
struct xencons_info *info = dev_get_drvdata(&dev->dev);
xencons_disconnect_backend(info);
struct xencons_info *info = dev_get_drvdata(&dev->dev);
xencons_disconnect_backend(info);
- memset(info->intf, 0, PAGE_SIZE);
+ memset(info->intf, 0,
XEN_
PAGE_SIZE);
return xencons_connect_backend(dev, info);
}
return xencons_connect_backend(dev, info);
}