From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
To: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
LKML <linux-kernel@vger.kernel.org>,
systemtap-ml <systemtap@sources.redhat.com>,
Gary Hade <garyhade@us.ibm.com>
Subject: Re: [BUGFIX][PATCH] x86: fix set_fixmap to use phys_addr_t
Date: Thu, 9 Apr 2009 14:46:05 -0400 [thread overview]
Message-ID: <20090409184605.GA4252@Krystal> (raw)
In-Reply-To: <49DE3695.6040800@redhat.com>
* Masami Hiramatsu (mhiramat@redhat.com) wrote:
> Use phys_addr_t for receiving a physical address argument
> instead of unsigned long. This allows fixmap to handle
> pages higher than 4GB on x86-32.
>
You might also want to update arch/x86/mm/ioremap.c:early_set_fixmap()
and __early_set_fixmap().
Otherwise it looks good.
Thanks,
Mathieu
> Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
> Cc: Ingo Molnar <mingo@elte.hu>
> Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> ---
>
> arch/x86/include/asm/fixmap.h | 4 ++--
> arch/x86/include/asm/paravirt.h | 4 ++--
> arch/x86/mm/pgtable.c | 3 ++-
> arch/x86/xen/mmu.c | 2 +-
> 4 files changed, 7 insertions(+), 6 deletions(-)
>
>
> diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
> index 81937a5..2d81af3 100644
> --- a/arch/x86/include/asm/fixmap.h
> +++ b/arch/x86/include/asm/fixmap.h
> @@ -151,11 +151,11 @@ extern pte_t *pkmap_page_table;
>
> void __native_set_fixmap(enum fixed_addresses idx, pte_t pte);
> void native_set_fixmap(enum fixed_addresses idx,
> - unsigned long phys, pgprot_t flags);
> + phys_addr_t phys, pgprot_t flags);
>
> #ifndef CONFIG_PARAVIRT
> static inline void __set_fixmap(enum fixed_addresses idx,
> - unsigned long phys, pgprot_t flags)
> + phys_addr_t phys, pgprot_t flags)
> {
> native_set_fixmap(idx, phys, flags);
> }
> diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
> index 7727aa8..378e369 100644
> --- a/arch/x86/include/asm/paravirt.h
> +++ b/arch/x86/include/asm/paravirt.h
> @@ -347,7 +347,7 @@ struct pv_mmu_ops {
> /* Sometimes the physical address is a pfn, and sometimes its
> an mfn. We can tell which is which from the index. */
> void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
> - unsigned long phys, pgprot_t flags);
> + phys_addr_t phys, pgprot_t flags);
> };
>
> struct raw_spinlock;
> @@ -1432,7 +1432,7 @@ static inline void arch_leave_lazy_mmu_mode(void)
> void arch_flush_lazy_mmu_mode(void);
>
> static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
> - unsigned long phys, pgprot_t flags)
> + phys_addr_t phys, pgprot_t flags)
> {
> pv_mmu_ops.set_fixmap(idx, phys, flags);
> }
> diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
> index 7a4d6ee..8e43bdd 100644
> --- a/arch/x86/mm/pgtable.c
> +++ b/arch/x86/mm/pgtable.c
> @@ -347,7 +347,8 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte)
> fixmaps_set++;
> }
>
> -void native_set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t flags)
> +void native_set_fixmap(enum fixed_addresses idx, phys_addr_t phys,
> + pgprot_t flags)
> {
> __native_set_fixmap(idx, pfn_pte(phys >> PAGE_SHIFT, flags));
> }
> diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
> index db3802f..2a81838 100644
> --- a/arch/x86/xen/mmu.c
> +++ b/arch/x86/xen/mmu.c
> @@ -1750,7 +1750,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
> }
> #endif /* CONFIG_X86_64 */
>
> -static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot)
> +static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
> {
> pte_t pte;
>
--
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
next prev parent reply other threads:[~2009-04-09 18:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-04 14:34 [BUG][-tip] kprobes on module functions hits kernel BUG in text_poke on x86-32 Masami Hiramatsu
2009-04-04 15:42 ` Mathieu Desnoyers
2009-04-04 18:28 ` Masami Hiramatsu
2009-04-04 19:04 ` Masami Hiramatsu
2009-04-05 3:46 ` Masami Hiramatsu
2009-04-05 3:49 ` Masami Hiramatsu
2009-04-06 17:11 ` [BUGFIX][PATCH -tip] x86: fix text_poke to handle highmem pages Masami Hiramatsu
2009-04-06 17:32 ` Mathieu Desnoyers
2009-04-06 17:44 ` Masami Hiramatsu
2009-04-06 17:58 ` Mathieu Desnoyers
2009-04-06 20:23 ` Masami Hiramatsu
2009-04-08 12:31 ` Ingo Molnar
2009-04-08 14:57 ` Masami Hiramatsu
2009-04-08 14:59 ` Ingo Molnar
2009-04-09 17:55 ` [BUGFIX][PATCH] x86: fix set_fixmap to use phys_addr_t Masami Hiramatsu
2009-04-09 18:46 ` Mathieu Desnoyers [this message]
2009-04-09 21:52 ` Masami Hiramatsu
2009-04-10 14:06 ` [tip:x86/urgent] " Masami Hiramatsu
2009-04-10 15:20 ` Masami Hiramatsu
2009-04-10 16:05 ` Mathieu Desnoyers
2009-04-10 17:48 ` Masami Hiramatsu
2009-04-10 18:30 ` Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090409184605.GA4252@Krystal \
--to=mathieu.desnoyers@polymtl.ca \
--cc=akpm@linux-foundation.org \
--cc=ananth@in.ibm.com \
--cc=garyhade@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@redhat.com \
--cc=mingo@elte.hu \
--cc=systemtap@sources.redhat.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).