* linux-next: manual merge of the xen-tip tree with the arm-current tree
@ 2014-01-07 4:42 Stephen Rothwell
2014-01-07 13:32 ` Stefano Stabellini
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-01-07 4:42 UTC (permalink / raw)
To: Jeremy Fitzhardinge, Konrad Rzeszutek Wilk, Stefano Stabellini,
Xen Devel, Russell King
Cc: linux-next, linux-kernel, Rob Herring, Wei Liu
[-- Attachment #1: Type: text/plain, Size: 1051 bytes --]
Hi all,
Today's linux-next merge of the xen-tip tree got a conflict in
arch/arm/include/asm/xen/page.h between commit 0a5ccc86507f ("ARM:
7933/1: rename ioremap_cached to ioremap_cache") from the tree and
commit 02bcf053e9c5 ("asm/xen/page.h: remove redundant semicolon") from
the xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/include/asm/xen/page.h
index 3759cacdd7f8,709c4b4d2f1d..000000000000
--- a/arch/arm/include/asm/xen/page.h
+++ b/arch/arm/include/asm/xen/page.h
@@@ -117,6 -117,7 +117,7 @@@ static inline bool set_phys_to_machine(
return __set_phys_to_machine(pfn, mfn);
}
- #define xen_remap(cookie, size) ioremap_cache((cookie), (size));
-#define xen_remap(cookie, size) ioremap_cached((cookie), (size))
++#define xen_remap(cookie, size) ioremap_cache((cookie), (size))
+ #define xen_unmap(cookie) iounmap((cookie))
#endif /* _ASM_ARM_XEN_PAGE_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the xen-tip tree with the arm-current tree
2014-01-07 4:42 linux-next: manual merge of the xen-tip tree with the arm-current tree Stephen Rothwell
@ 2014-01-07 13:32 ` Stefano Stabellini
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Stabellini @ 2014-01-07 13:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jeremy Fitzhardinge, Konrad Rzeszutek Wilk, Stefano Stabellini,
Xen Devel, Russell King, linux-next, linux-kernel, Rob Herring,
Wei Liu
On Tue, 7 Jan 2014, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in
> arch/arm/include/asm/xen/page.h between commit 0a5ccc86507f ("ARM:
> 7933/1: rename ioremap_cached to ioremap_cache") from the tree and
> commit 02bcf053e9c5 ("asm/xen/page.h: remove redundant semicolon") from
> the xen-tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
That's fine, thanks!
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/include/asm/xen/page.h
> index 3759cacdd7f8,709c4b4d2f1d..000000000000
> --- a/arch/arm/include/asm/xen/page.h
> +++ b/arch/arm/include/asm/xen/page.h
> @@@ -117,6 -117,7 +117,7 @@@ static inline bool set_phys_to_machine(
> return __set_phys_to_machine(pfn, mfn);
> }
>
> - #define xen_remap(cookie, size) ioremap_cache((cookie), (size));
> -#define xen_remap(cookie, size) ioremap_cached((cookie), (size))
> ++#define xen_remap(cookie, size) ioremap_cache((cookie), (size))
> + #define xen_unmap(cookie) iounmap((cookie))
>
> #endif /* _ASM_ARM_XEN_PAGE_H */
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-07 13:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-07 4:42 linux-next: manual merge of the xen-tip tree with the arm-current tree Stephen Rothwell
2014-01-07 13:32 ` Stefano Stabellini
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).