From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: rpm@xenomai.org
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [PATCH] powerpc: Fix _PAGE_CHG_MASK
Date: Fri, 13 Feb 2009 13:49:10 +1100 [thread overview]
Message-ID: <1234493350.29851.80.camel@pasglop> (raw)
In-Reply-To: <4994A046.2080806@xenomai.org>
On Thu, 2009-02-12 at 23:18 +0100, Philippe Gerum wrote:
> Fix _PAGE_CHG_MASK so that pte_modify() does not affect the _PAGE_SPECIAL bit.
>
> Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Good catch ! Thanks !
Ben.
> --
>
> arch/powerpc/include/asm/pgtable-4k.h | 2 +-
> arch/powerpc/include/asm/pgtable-64k.h | 2 +-
> arch/powerpc/include/asm/pgtable-ppc32.h | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/pgtable-4k.h b/arch/powerpc/include/asm/pgtable-4k.h
> index 6b18ba9..1dbca4e 100644
> --- a/arch/powerpc/include/asm/pgtable-4k.h
> +++ b/arch/powerpc/include/asm/pgtable-4k.h
> @@ -60,7 +60,7 @@
> /* It should be preserving the high 48 bits and then specifically */
> /* preserving _PAGE_SECONDARY | _PAGE_GROUP_IX */
> #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | \
> - _PAGE_HPTEFLAGS)
> + _PAGE_HPTEFLAGS | _PAGE_SPECIAL)
>
> /* Bits to mask out from a PMD to get to the PTE page */
> #define PMD_MASKED_BITS 0
> diff --git a/arch/powerpc/include/asm/pgtable-64k.h b/arch/powerpc/include/asm/pgtable-64k.h
> index 07b0d8f..7389003 100644
> --- a/arch/powerpc/include/asm/pgtable-64k.h
> +++ b/arch/powerpc/include/asm/pgtable-64k.h
> @@ -114,7 +114,7 @@ static inline struct subpage_prot_table *pgd_subpage_prot(pgd_t *pgd)
> * pgprot changes
> */
> #define _PAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \
> - _PAGE_ACCESSED)
> + _PAGE_ACCESSED | _PAGE_SPECIAL)
>
> /* Bits to mask out from a PMD to get to the PTE page */
> #define PMD_MASKED_BITS 0x1ff
> diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h
> index 75dded6..8298afc 100644
> --- a/arch/powerpc/include/asm/pgtable-ppc32.h
> +++ b/arch/powerpc/include/asm/pgtable-ppc32.h
> @@ -428,8 +428,8 @@ extern int icache_44x_need_flush;
> #define PMD_PAGE_SIZE(pmd) bad_call_to_PMD_PAGE_SIZE()
> #endif
>
> -#define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_SPECIAL)
> -
> +#define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | \
> + _PAGE_SPECIAL)
>
> #define PAGE_PROT_BITS (_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \
> _PAGE_WRITETHRU | _PAGE_ENDIAN | \
>
next prev parent reply other threads:[~2009-02-13 2:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-12 22:18 [PATCH] powerpc: Fix _PAGE_CHG_MASK Philippe Gerum
2009-02-13 2:49 ` Benjamin Herrenschmidt [this message]
2009-02-13 5:46 ` Benjamin Herrenschmidt
2009-02-13 10:01 ` Philippe Gerum
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=1234493350.29851.80.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=rpm@xenomai.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).