Hi Linus,
The patch has been changed like you wanted, with page->zone
shoved into page->flags. I've also pulled the thing up to
your latest changes from linux.bkbits.net so you should be
able to just pull it into your tree from:
bk://linuxvm.bkbits.net/linux-2.5-struct_page
You can also view the patch on:
http://surriel.com/patches/2.5/2.5.5-p2-struct_page5
I'm not retransmitting it to lkml as very little has changed.
Please apply the patch to your 2.5 tree.
thank you,
Rik
----> begin standard blurb of explanation <----
I've forward-ported a small part of the -rmap patch to 2.5,
the shrinkage of the struct page. Most of this code is from
William Irwin and Christoph Hellwig.
The executive summary:
o page->wait is removed, instead we use a hash table of wait
queues per zone ... collisions are ok because of wake-all
semantics
o page->virtual is only used on highmem machines and sparc64,
other machines calculate the address instead
o page->zone is moved into page->flags
Linus, please pull from the bk tree:
bk://linuxvm.bkbits.net/linux-2.5-struct_page
Rik van Riel wrote:
> I've also pulled the thing up to
> your latest changes from linux.bkbits.net so you should be
> able to just pull it into your tree from:
Note that with BK, unlike CVS, it is not required that you update to the
latest Linus tree before he can pull.
It is only desired that you do so if there is an actual conflict you
need to resolve...
Jeff
--
Jeff Garzik | "Why is it that attractive girls like you
Building 1024 | always seem to have a boyfriend?"
MandrakeSoft | "Because I'm a nympho that owns a brewery?"
| - BBC TV show "Coupling"
On Tue, 19 Feb 2002, Jeff Garzik wrote:
> Rik van Riel wrote:
> > I've also pulled the thing up to
> > your latest changes from linux.bkbits.net so you should be
> > able to just pull it into your tree from:
>
> Note that with BK, unlike CVS, it is not required that you update to
> the latest Linus tree before he can pull.
>
> It is only desired that you do so if there is an actual conflict you
> need to resolve...
In this case there were 2 files with a potential conflict
(buffer.c and filemap.c).
No actual conflicts, but I thought it good manners to
pull the tree and resolve any potential conflicts myself,
instead of burdening Linus with the job.
regards,
Rik
--
"Linux holds advantages over the single-vendor commercial OS"
-- Microsoft's "Competing with Linux" document
http://www.surriel.com/ http://distro.conectiva.com/
On Tue, 19 Feb 2002, Rik van Riel wrote:
>
> The patch has been changed like you wanted, with page->zone
> shoved into page->flags. I've also pulled the thing up to
> your latest changes from linux.bkbits.net so you should be
> able to just pull it into your tree from:
>
> bk://linuxvm.bkbits.net/linux-2.5-struct_page
Btw, _please_ don't do things like changing the bitkeeper etc/config file.
Right now your very first changesets is something that I definitely do not
want in my tree.
Sure, I can do "bk cset -x" on the damn thing, but the fact is, I don't
want to have totally unnecessary undo's in my tree on things like this.
That's just stupid, and only makes the revision history look even less
readable than it already is..
Linus
On Tue, 19 Feb 2002, Linus Torvalds wrote:
> On Tue, 19 Feb 2002, Rik van Riel wrote:
> >
> > The patch has been changed like you wanted, with page->zone
> > shoved into page->flags. I've also pulled the thing up to
> > your latest changes from linux.bkbits.net so you should be
> > able to just pull it into your tree from:
> >
> > bk://linuxvm.bkbits.net/linux-2.5-struct_page
>
> Btw, _please_ don't do things like changing the bitkeeper etc/config file.
> Right now your very first changesets is something that I definitely do not
> want in my tree.
Woooops, I was trying to make the overview on linuxvm.bkbits.net
display something sensible but didn't realise you'd be pulling
that back into your tree ;((((
I'll make sure to not make this mistake again.
regards,
Rik
--
"Linux holds advantages over the single-vendor commercial OS"
-- Microsoft's "Competing with Linux" document
http://www.surriel.com/ http://distro.conectiva.com/
On Tue, Feb 19, 2002 at 11:21:34AM -0800, Linus Torvalds wrote:
> > The patch has been changed like you wanted, with page->zone
> > shoved into page->flags. I've also pulled the thing up to
> > your latest changes from linux.bkbits.net so you should be
> > able to just pull it into your tree from:
> >
> > bk://linuxvm.bkbits.net/linux-2.5-struct_page
>
> Btw, _please_ don't do things like changing the bitkeeper etc/config file.
> Right now your very first changesets is something that I definitely do not
> want in my tree.
This is really a problem for bkbits to solve if I understand it correctly.
Rik wants to "name" his tree. If we the bkbits admin interface have a
"desc" command which changes the description listed on the web pages, then
I think he'll be happy, right? We had the same problem with the PPC tree,
people do this without realizing the implications.
I'd suggest a changeset to the config file which says
# Don't change the description unless you are Linus.
--
---
Larry McVoy lm at bitmover.com http://www.bitmover.com/lm
On Tue, 19 Feb 2002, Larry McVoy wrote:
> This is really a problem for bkbits to solve if I understand it
> correctly. Rik wants to "name" his tree. If we the bkbits admin
> interface have a "desc" command which changes the description listed
> on the web pages, then I think he'll be happy, right?
Indeed. The problem was that I was getting too many trees
on linuxvm.bkbits.net and would only end up confusing people
what was what...
> I'd suggest a changeset to the config file which says
>
> # Don't change the description unless you are Linus.
Nice warning ;)
regards,
Rik
--
"Linux holds advantages over the single-vendor commercial OS"
-- Microsoft's "Competing with Linux" document
http://www.surriel.com/ http://distro.conectiva.com/
On Tue, 19 Feb 2002, Linus Torvalds wrote:
> Btw, _please_ don't do things like changing the bitkeeper etc/config
> file. Right now your very first changesets is something that I
> definitely do not want in my tree.
Since bk doesn't seem to let me remove the thing from the
history (probably with some good reason), I guess you
might as well import the following patch:
http://surriel.com/patches/2.5/2.5.5-p2-struct_page5
As a side effect, this patch should reduce the whole
thing to one changeset, which isn't all bad since we
don't need to have the history of Linux cluttered up
with all the minor changes to this patch ;)
regards,
Rik
--
"Linux holds advantages over the single-vendor commercial OS"
-- Microsoft's "Competing with Linux" document
http://www.surriel.com/ http://distro.conectiva.com/
On Tue, Feb 19, 2002 at 04:35:26PM -0300, Rik van Riel wrote:
> On Tue, 19 Feb 2002, Larry McVoy wrote:
> > This is really a problem for bkbits to solve if I understand it
> > correctly. Rik wants to "name" his tree. If we the bkbits admin
> > interface have a "desc" command which changes the description listed
> > on the web pages, then I think he'll be happy, right?
>
> Indeed. The problem was that I was getting too many trees
> on linuxvm.bkbits.net and would only end up confusing people
> what was what...
I've got Amy working on a change so you can do a
admin shell>> desc [-rrepo] whatever you want
and it will change the description to "whatever you want" on repo if specified,
or all if not.
--
---
Larry McVoy lm at bitmover.com http://www.bitmover.com/lm