| Message ID | eb4d626514e22f85814830012642329018ef6af9.1565786091.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7c7a532ba3fc51bf9527d191fb410786c1fdc73c |
| Headers | show |
| Series | [1/5] powerpc/ptdump: fix addresses display on PPC32 | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (da206bd46848568e1aaf35f00e2d78bf9bc94f95) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
Michael, Le 14/08/2019 à 14:36, Christophe Leroy a écrit : > Commit 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") > wrongly changed KERN_VIRT_START from 0 to PAGE_OFFSET, leading to a > shift in the displayed addresses. > > Lets revert that change to resync walk_pagetables()'s addr val and > pgd_t pointer for PPC32. > > Fixes: 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") Either this patch or patch 2 of the series has to go into fixes. If you prefer next patch for fixes, then this one can be squashed into patch 3 which drops the PPC32 hacked definition of KERN_VIRT_START Christophe > Cc: stable@vger.kernel.org > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > arch/powerpc/mm/ptdump/ptdump.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c > index 6a88a9f585d4..3ad64fc11419 100644 > --- a/arch/powerpc/mm/ptdump/ptdump.c > +++ b/arch/powerpc/mm/ptdump/ptdump.c > @@ -27,7 +27,7 @@ > #include "ptdump.h" > > #ifdef CONFIG_PPC32 > -#define KERN_VIRT_START PAGE_OFFSET > +#define KERN_VIRT_START 0 > #endif > > /* >
On Wed, 2019-08-14 at 12:36:09 UTC, Christophe Leroy wrote: > Commit 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") > wrongly changed KERN_VIRT_START from 0 to PAGE_OFFSET, leading to a > shift in the displayed addresses. > > Lets revert that change to resync walk_pagetables()'s addr val and > pgd_t pointer for PPC32. > > Fixes: 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") > Cc: stable@vger.kernel.org > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/7c7a532ba3fc51bf9527d191fb410786c1fdc73c cheers
diff --git a/arch/powerpc/mm/ptdump/ptdump.c b/arch/powerpc/mm/ptdump/ptdump.c index 6a88a9f585d4..3ad64fc11419 100644 --- a/arch/powerpc/mm/ptdump/ptdump.c +++ b/arch/powerpc/mm/ptdump/ptdump.c @@ -27,7 +27,7 @@ #include "ptdump.h" #ifdef CONFIG_PPC32 -#define KERN_VIRT_START PAGE_OFFSET +#define KERN_VIRT_START 0 #endif /*
Commit 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") wrongly changed KERN_VIRT_START from 0 to PAGE_OFFSET, leading to a shift in the displayed addresses. Lets revert that change to resync walk_pagetables()'s addr val and pgd_t pointer for PPC32. Fixes: 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/mm/ptdump/ptdump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)