| Message ID | Pine.LNX.4.64.0904062156290.21044@blonde.anvils (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | adf213c43898f2324cfc35c315556bc21cb65b31 |
| Delegated to: | Paul Mackerras |
| Headers | show |
Hugh Dickins writes: > Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed, > let powerpc 256kB pages coexist with CONFIG_SHMEM again. > > Signed-off-by: Hugh Dickins <hugh@veritas.com> > --- > Added linuxppc-dev and some other Cc's for this 3/3: sorry > if you didn't see 1/3 and 2/3, they were just in mm/shmem.c. Looks OK - what path are you using to get the series upstream? (I.e. should I be putting 3/3 in the powerpc tree or are you going to push it along with the others?) Paul.
On Tue, 7 Apr 2009, Paul Mackerras wrote: > Hugh Dickins writes: > > > Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed, > > let powerpc 256kB pages coexist with CONFIG_SHMEM again. > > > > Signed-off-by: Hugh Dickins <hugh@veritas.com> > > --- > > Added linuxppc-dev and some other Cc's for this 3/3: sorry > > if you didn't see 1/3 and 2/3, they were just in mm/shmem.c. > > Looks OK - what path are you using to get the series upstream? > (I.e. should I be putting 3/3 in the powerpc tree or are you going to > push it along with the others?) If it's OK with you (and you're saying it is), I think the best would be for it to sit alongside 1/3 and 2/3 in Andrew's tree, hopefully get an Ack from Yuri (I don't have any powerpc 256kB pages myself to test it fully), and then go on into 2.6.30. Hugh
On Mon, 6 Apr 2009 22:01:15 +0100 (BST) Hugh Dickins <hugh@veritas.com> wrote: > Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed, > let powerpc 256kB pages coexist with CONFIG_SHMEM again. > > Signed-off-by: Hugh Dickins <hugh@veritas.com> > --- > Added linuxppc-dev and some other Cc's for this 3/3: sorry > if you didn't see 1/3 and 2/3, they were just in mm/shmem.c. Do we think these patches should be in 2.6.30?
On Thu, 9 Apr 2009, Andrew Morton wrote: > On Mon, 6 Apr 2009 22:01:15 +0100 (BST) > Hugh Dickins <hugh@veritas.com> wrote: > > > Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed, > > let powerpc 256kB pages coexist with CONFIG_SHMEM again. > > > > Signed-off-by: Hugh Dickins <hugh@veritas.com> > > --- > > Added linuxppc-dev and some other Cc's for this 3/3: sorry > > if you didn't see 1/3 and 2/3, they were just in mm/shmem.c. > > Do we think these patches should be in 2.6.30? I think so - 2.6.30 will have the rest of Yuri's 256kB page support. But it would be nice to have an Ack from Yuri before sending these on through. 2/3 is a bugfix justified even without 256kB pages - I should have inverted the ordering. Hugh
Hi Hugh, Hugh Dickins wrote: > Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed, > let powerpc 256kB pages coexist with CONFIG_SHMEM again. > > Signed-off-by: Hugh Dickins <hugh@veritas.com> > Acked-by: Ilya Yanok <yanok@emcraft.com> > --- > Added linuxppc-dev and some other Cc's for this 3/3: sorry > if you didn't see 1/3 and 2/3, they were just in mm/shmem.c. > > arch/powerpc/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- 2.6.29-git13/arch/powerpc/Kconfig 2009-04-06 11:47:57.000000000 +0100 > +++ linux/arch/powerpc/Kconfig 2009-04-06 18:18:47.000000000 +0100 > @@ -462,7 +462,7 @@ config PPC_64K_PAGES > > config PPC_256K_PAGES > bool "256k page size" if 44x > - depends on !STDBINUTILS && (!SHMEM || BROKEN) > + depends on !STDBINUTILS > help > Make the page size 256k. > > Regards, Ilya.
--- 2.6.29-git13/arch/powerpc/Kconfig 2009-04-06 11:47:57.000000000 +0100 +++ linux/arch/powerpc/Kconfig 2009-04-06 18:18:47.000000000 +0100 @@ -462,7 +462,7 @@ config PPC_64K_PAGES config PPC_256K_PAGES bool "256k page size" if 44x - depends on !STDBINUTILS && (!SHMEM || BROKEN) + depends on !STDBINUTILS help Make the page size 256k.
Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed, let powerpc 256kB pages coexist with CONFIG_SHMEM again. Signed-off-by: Hugh Dickins <hugh@veritas.com> --- Added linuxppc-dev and some other Cc's for this 3/3: sorry if you didn't see 1/3 and 2/3, they were just in mm/shmem.c. arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)