Skip to contentSkip to conversation

Unified x86 architecture, arch/x86

RFC Thomas Gleixner 24 participants 45 messages Jul 20, 2007 – Jul 27, 2007

lore
Share & tools
lore
#0 lore raw

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

What is this about?
-------------------

The topic of sharing more x86 code has been discussed on LKML a number of times. Various approaches were discussed and we decided to advance the discussion by implementing a full solution that brings the transition to a shared tree to completion.

Warning: our approach is quite a bit more extreme than what has been suggested before.

The core idea behind our project is simple to describe: we introduce a new arch/x86/ and include/asm-x86/ file hierarchy that includes all the existing 32-bit and 64-bit x86 code and allows the building of either a 32-bit (i386) kernel or a 64-bit (x86_64) kernel.

In this initial implementation the old arch/i386 and arch/x86_64 trees are removed _immediately_, in the same commit, and all future x86 development goes on in the new, shared tree. So the transition right now is one atomic operation.

As a next step we plan to generate a gradual, fully bisectable, fully working switchover from the current code to the fully populated arch/x86 tree. It will result in about 1000-2000 commits. We are releasing our current solution because it 100% represents the finally resulting arch/x86 source tree already, and we first wanted to make sure that the new architecture layout works fine and folks are happy before we go and do the (even more complex) fine-grained work.

A git tree is available from:

git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86.git

One (large!) combo patch is available at:

http://kernel.org/pub/linux/kernel/people/tglx/linux-x86.2.6.22-git-ede13d.combo.patch.bz2

the patch is against this upstream -git head:

commit ede13d81b4dda409a6d271b34b8e2ec9383e255d

It makes little sense to apply this patch to anything else because these architectures are such a fast-moving target.

Why do we want to do this?
--------------------------

We believe that the whole x86 CPU family is very much related and should be supported in a single architecture tree. All 64-bit CPUs implement the ability to execute pure 32-bit kernels, and will probably do so for the next couple of decades. So it's not like it will ever be possible to get rid of our legacies: for example even the latest 64-bit CPUs implement the legacy "A20 line" feature that was already a weird outdated hack in the days of 16-bit x8086 CPUs.

So what can we do? We should learn to live better with our legacies, and we should avoid reinventing the wheel in 64-bit code. Today there's already some limited code sharing between the i386 and x86_64 trees, but it's quite non-obvious: it's either done via a placeholder file that #include's an out-of-arch file, or a Makefile rule that uses an out-of-arch file. These 'cross-tree' file uses are not visible at the target point, and people sometimes break "the other arch" if they modify the file, because they are not aware of there being code sharing.

Furthermore, the separate i386 and x86_64 trees often cause kernel writers to (unconsciously) think in either 32-bit or in 64-bit terms, instead of thinking about the two things in one way. It also happened numerous times that code that was originally copied from arch/i386 gets 64-bit-only additions in arch/x86_64, and if a bug is fixed in the 32-bit code, that fix is not applied to the x86_64 tree. Or some function is cleaned up and improved in the x86_64 tree, but that improvement is not easily adaptable to arch/i386, because the x86_64 code became 64-bit only already.

All in one: the two architecture trees are "way too far apart" from each other, which causes the source code to diverge not only physically but structurally as well. The whole setup works _against_ sharing code, instead of working _for_ sharing code. This causes double maintenance even for functionality that is conceptually the same for the 32-bit and the 64-bit tree. (such as support for standard PC platform architecture devices)

How did we do it?
-----------------

As an initial matter, we made it painstakingly sure that the resulting .o files in a 32-bit build are bit for bit equal. (at least in terms of .text, small .data differences are there due to the namespace changes). We also made it sure that you can pick up _any_ existing 32-bit .config, stick it into our new arch/x86 tree and build a fully working 32-bit kernel. Same is the goal for any existing 64-bit .config as well.

The shared x86 tree is _not_ "merge the 32-bit legacy code into the x86_64 tree". It is _not_ "create a x86_64 tree that can run on modern 32-bit hardware too, leave arch/i386 around for ancient stuff". It is a unification between equals, all legacies and all new code is unified into one shared tree. Nothing is left behind.

A key component of our change is that only a very small portion of the conversion was done 'manually' - the overwhelming majority of file movement happened in an automated fashion. We did this to reduce the chance of human errors in the process of moving and rearranging more than a 1000 files.

We also made the change fully bisectable: you can bisect 'across' the big arch/x86 commit and the .config's will be picked up correctly. The git-history of all previously existing files has also been preserved via the use of git's file-movement feature. The more fine-grained multiple commits approach which we are ready to do is also providing a fully bisectable and history preserving solution.

How is the new arch/x86 and include/asm-x86 namespace layed out? Our foremost concern was to enable a 100% smooth transition to the new, shared architecture, while still enabling much more fine-grained future unification of the source code. To do this we consciously aimed for the strictest possible unification strategy: we only 'unified' those source files that are already bit for bit equal between the two architectures today. For all other files we used the following rule: if a file came from arch/i386/foo/bar.c, it gets moved to arch/x86/foo/bar_32.c, if it came from arch/x86_64/foo/bar.c it gets moved to arch/x86/foo/bar_64.c. We also generated arch/x86/foo/bar.c that simply #include's those two files (depending on whether we do a 32-bit or a 64-bit built). If a file only existed in only one of the architectures, it's moved to arch/x86/foo/bar.c straight away. (take a look at our git repository to see how this works out in practice.)

Include files are handles similarly in include/asm-x86, with the exception of include files that are exported to user-space: for those, to preserve the source code API towards user-space, Kbuild creates symlinks from the _32.h or _64.h files to the .h file, instead of a stub .h file. In the future the number of such symlinks can be reduced significantly by unifying the files.

The arch/i386 and arch/x86_64 trees are removed completely, except for a small Kconfig and kbuild stub to ease bisection and to ease the import (and export) of .configs into the new, shared x86 architecture.

And we are serious about no-compromises compatibility of the transition:
we built and booted an arch/x86 kernel on a real i386 DX CPU. (Yes, an old 33 MHz one. No, the CPU did not melt, Linux booted up fine!) We also built and booted a 64-bit kernel on a quad-core 64-bit CPU from the shared tree. (and on a number of other x86 systems.)

What will happen to arch/x86 in the future?
-------------------------------------------

Future, fine-grained unification is the main idea behind the new layout:
'unifying' a 32-bit and a 64-bit source code file will be a matter of creating a single .c file from a _32.c and _64.c file. Those patches will be easy to review and will be straightforward to create. We chose not to do any of those unifications in this initial work yet, even if they were easy to do, to be able to guarantee the bit-for-bit equivalency of the new tree to the old trees.

When should this go upstream?
-----------------------------

We actually think that the sooner we get over with this, the better.

Once the precise method is agreed upon, the best period of the transition is when other larger-scale changes are done typically:
right at the end of a merge window, when most of the architecture flux has flown into the tree already (so that the transition does not cause hickup in merge activities), but when we still have a maximum amount of time left to fix up any effects of the unification.

This tree cannot really be carried in -mm or in other devel trees due to its size and intrusiveness.

This is also true for the fine-grained solution, which should be done in one go as well. We do not believe that a "Chinese 5 year transition plan" is something useful. When we switch in one go we have two advantages:

1) it is a single synchronization point for folks with patches against that code

2) it is more likely that people tackle the unification of file_32.c and file_64.c which are in the same source directory than the unification of arch/i386/..../file.c and arch/x86_64/..../file.c

As usual, comments and suggestions are welcome!

Thomas, Ingo

#1 lore raw

I agree with Andi... it's quite nice to be able to leave some arch/i386 stuff, and not carry it over to arch/x86-64.

Jeff

#2 lore raw
Quoted 2 lines · Jeff Garzik

I agree with Andi... it's quite nice to be able to leave some arch/i386 stuff, and not carry it over to arch/x86-64.

we can leave those few items in arch/x86 just as much. No need to keep around a legacy tree for that.

Ingo

#3 lore raw
Quoted 5 lines · Ingo Molnar
Quoted 1 line · Jeff Garzik

I agree with Andi... it's quite nice to be able to leave some arch/i386 stuff, and not carry it over to arch/x86-64.

we can leave those few items in arch/x86 just as much. No need to keep around a legacy tree for that.

By extension it makes doing that sort of thing, in general, more difficult. Which is IMO not desirable.

Jeff

#4 lore raw
Quoted 11 lines · Jeff Garzik
Quoted 7 lines · Ingo Molnar
Quoted 2 lines · Jeff Garzik

I agree with Andi... it's quite nice to be able to leave some arch/i386 stuff, and not carry it over to arch/x86-64.

we can leave those few items in arch/x86 just as much. No need to keep around a legacy tree for that.

By extension it makes doing that sort of thing, in general, more difficult. Which is IMO not desirable.

I think it's *much* harder to carry legacy things around in an old tree that almost nobody even uses any more (probably not true yet, but for most of the main developers, I bet it will be true in a year). Especially one that just duplicates 99% of the stuff.

There really isn't that much legacy crud. There are things like random quirks, but every time I hear the (theoretical) argument about how much time and effort we save by having it duplicated somewhere else, I think about all the time we definitely waste by fixing the same bug twice (and worry about the cases where we don't).

Linus

#5 lore raw
In reply to Ingo Molnar
Quoted 8 lines · Ingo Molnar
Quoted 2 lines · Jeff Garzik

I agree with Andi... it's quite nice to be able to leave some arch/i386 stuff, and not carry it over to arch/x86-64.

we can leave those few items in arch/x86 just as much. No need to keep around a legacy tree for that.

how about making all files ans directories take _32 or _64 in the name? except the files or dir that are shared.

for example: k8_bus.c is only need by 64 ===> change it to k8_bus_64.c mach-generic===> mach-generic_32

YH

#6 lore raw
In reply to Jeff Garzik
Quoted 2 lines · On Fri, 20 Jul 2007 18:38:39 -0400 Jeff Garzik <[email protected]> wrote:

I agree with Andi... it's quite nice to be able to leave some arch/i386 stuff, and not carry it over to arch/x86-64.

Its easy enough to push that stuff into arch/x86/legacy and have one subdirectory of stuff to pull in for ancient systems.

Alan

#7 lore raw
Quoted 8 lines · Alan Cox
Quoted 2 lines · On Fri, 20 Jul 2007 18:38:39 -0400 Jeff Garzik <[email protected]> wrote:

I agree with Andi... it's quite nice to be able to leave some arch/i386 stuff, and not carry it over to arch/x86-64.

Its easy enough to push that stuff into arch/x86/legacy and have one subdirectory of stuff to pull in for ancient systems.

The other thing is that "legacy" in this context is fungible. No IOMMU was legacy until the Intel x86-64 chips came out, and I can promise you that some legacy code will be necessary once we start seeing VIA and others come out with embedded x86-64.

On the other hand, it's pretty bloody safe to assume that we'll never see an x86-64 chip without CPUID, CMOV, FXSAVE, SSE-2, CMPXCHG, etc.

-hpa

#8 lore raw
In reply to Alan Cox

* From: Alan Cox
* Date: Sat, 21 Jul 2007 00:55:12 +0100
* Organization: Red Hat UK Cyf., Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, Y Deyrnas Gyfunol. Cofrestrwyd yng Nghymru a Lloegr o'r rhif cofrestru 3798903

Quoted 9 lines
Quoted 2 lines · On Fri, 20 Jul 2007 18:38:39 -0400 Jeff Garzik <[email protected]> wrote:

I agree with Andi... it's quite nice to be able to leave some arch/i386 stuff, and not carry it over to arch/x86-64.

Its easy enough to push that stuff into arch/x86/legacy and have one subdirectory of stuff to pull in for ancient systems.

Or if i386 and virualization guys don't want to quietly break/mess with stuff pulled by x86-64, move it to x86-64 instead. Elegant, easy, honors Andi.
____

#9 lore raw
In reply to Thomas Gleixner
Quoted 3 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

I really like the idea of a unified source tree for the 2 x86 variants. The technical differences are really small (of course there are differences, especially in the boot sequence), and striving to unify as much as possible while having a clean way to do per 32/64 bit parts as well is something that imo is the right thing.

I'm more than happy to help with this effort, and have people in my group at Intel help test and engineer this as well.

The technical approach of first moving (in an automated way) everything into one directory, and then merge pieces one by one is appealing since it can be done incrementally and carefully, while testing the "can we do separate bits" from the start.

So in short, way to go, I hope we can get this thing done as soon as possible. Heck it looks like the infrastructure (not the unification) can make it into 2.6.23 merge window still, so that the entire 2.6.23 window can be used to develop merged-functionality pieces...

Greetings,
Arjan van de Ven

#10 lore raw
Quoted 7 lines · Arjan van de Ven
Quoted 3 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

Quoted 6 lines

I really like the idea of a unified source tree for the 2 x86 variants. The technical differences are really small (of course there are differences, especially in the boot sequence), and striving to unify as much as possible while having a clean way to do per 32/64 bit parts as well is something that imo is the right thing.

Not to mention all the paravirt stuff that's going on. Having a single x86 arch to work with would be greatly beneficial to the work being done to port paravirt to x86_64.

Way to go, Thomas and Ingo!

-- Steve

#11 lore raw
Quoted 10 lines · Steven Rostedt
Quoted 6 lines

I really like the idea of a unified source tree for the 2 x86 variants. The technical differences are really small (of course there are differences, especially in the boot sequence), and striving to unify as much as possible while having a clean way to do per 32/64 bit parts as well is something that imo is the right thing.

Not to mention all the paravirt stuff that's going on. Having a single x86 arch to work with would be greatly beneficial to the work being done to port paravirt to x86_64.

As for paravirt, it'd really help. As I had the tree lagged behind by so much, a great part of the work now is checking where i386 is, seeing if it applies for 64-bit, and so on. The differences are not so huge, and I'm trying my best to not let them deviate too much. It could mostly be built incrementally.

And I bet a huge part of the tree could be like this too: In most places, they are different for no particular reason, just because two people implemented it separately. There'd be a huge effort to bring those differences into an end, but I think I'd pay in future development speed. (not to mention the duplicate bugs linus have already talked about)

Quoted 1 line

Way to go, Thomas and Ingo!

I am pretty much for it too.

Signature · 5 lines
Glauber de Oliveira Costa.
"Free as in Freedom"
http://glommer.net

"The less confident you are, the more serious you have to act."
#12 lore raw
In reply to Thomas Gleixner

Hi,

Quoted 5 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

What is this about?

[..]

Quoted 1 line

As usual, comments and suggestions are welcome!

I really like this idea - code duplication is a bad thing.

BTW. I don't see any regression here :)

Quoted 2 lines

Thomas, Ingo

Regards,
Michal

Signature · 2 lines
LOG
http://www.stardust.webpages.pl/log/
#13 lore raw
Quoted 11 lines · Michal Piotrowski
Quoted 5 lines

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

What is this about?

[..]

Quoted 1 line

As usual, comments and suggestions are welcome!

I really like this idea - code duplication is a bad thing.

BTW. I don't see any regression here :)

cool - could you tell us a bit more about on what type of box you tried it, and how wide and versatile the .config is?

Ingo

#14 lore raw
Quoted 9 lines · Ingo Molnar
Quoted 6 lines · Michal Piotrowski
Quoted 5 lines

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

What is this about?

[..]

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

As usual, comments and suggestions are welcome!

I really like this idea - code duplication is a bad thing.

BTW. I don't see any regression here :)

cool - could you tell us a bit more about on what type of box you tried it,

it is an old P4 (i386)

Quoted 1 line

and how wide and versatile the .config is?

http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-git15/config

Quoted 3 lines

Ingo

Regards,
Michal

Signature · 2 lines
LOG
http://www.stardust.webpages.pl/log/
#15 lore raw
In reply to Michal Piotrowski
Quoted 7 lines · Michal Piotrowski

Hi,

Quoted 4 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

Quoted 7 lines
Quoted 1 line

What is this about?

[..]

Quoted 1 line

As usual, comments and suggestions are welcome!

I really like this idea - code duplication is a bad thing.

Did you actually look at the patch? It doesn't have a single line less duplication than there was before. Everything that could be easily shared was shared already.

It's just new window dressing without any real advantages.

-Andi

#16 lore raw
Quoted 11 lines · Michal Piotrowski
Quoted 2 lines

I really like this idea - code duplication is a bad thing.

Did you actually look at the patch? It doesn't have a single line less duplication than there was before. Everything that could be easily shared was shared already.

It's just new window dressing without any real advantages.

And did you read what tglx wrote?

This patch was the beginning of the merger, not the end result. It strived for binary identical images. It was to put everything together as a
_starting_point_! The next thing to do after this is to start the
merging.

-- Steve

#17 lore raw
Quoted 4 lines · On Saturday 21 July 2007 07:50:46 Steven Rostedt wrote:

This patch was the beginning of the merger, not the end result. It strived for binary identical images. It was to put everything together as a
_starting_point_! The next thing to do after this is to start the
merging.

Well we've been merging what makes sense since several years. So it's not really starting anything that hasn't already occurred.

-Andi

#18 lore raw
Quoted 9 lines · Andi Kleen
Quoted 4 lines · On Saturday 21 July 2007 07:50:46 Steven Rostedt wrote:

This patch was the beginning of the merger, not the end result. It strived for binary identical images. It was to put everything together as a
_starting_point_! The next thing to do after this is to start the
merging.

Well we've been merging what makes sense since several years. So it's not really starting anything that hasn't already occurred.

The problem with the current "merging" is that it's extremely hard to figure out whether some code in x86_64 might be using some code in i386 since there are currently 5 (five) different mechanisms used for sharing code between the two architectures.

It happens so often that someone accidentally breaks one architecture because he didn't notice the code also gets used on the other architecture.

Quoted 1 line

-Andi

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#19 lore raw
Quoted 8 lines · On Saturday 21 July 2007 09:35:33 Adrian Bunk wrote:

The problem with the current "merging" is that it's extremely hard to figure out whether some code in x86_64 might be using some code in i386 since there are currently 5 (five) different mechanisms used for sharing code between the two architectures.

It happens so often that someone accidentally breaks one architecture because he didn't notice the code also gets used on the other architecture.

That's not changing at all. Especially with even more sharing, (than I think would be prudent) like Thomas treated, you'll likely have to test compile both for most changes.

-Andi

#20 lore raw
Quoted 7 lines · Andi Kleen
Quoted 5 lines · On Saturday 21 July 2007 09:35:33 Adrian Bunk wrote:

The problem with the current "merging" is that it's extremely hard to figure out whether some code in x86_64 might be using some code in i386 since there are currently 5 (five) different mechanisms used for sharing code between the two architectures.

Quoted 7 lines
Quoted 3 lines

It happens so often that someone accidentally breaks one architecture because he didn't notice the code also gets used on the other architecture.

That's not changing at all. Especially with even more sharing, (than I think would be prudent) like Thomas treated, you'll likely have to test compile both for most changes.

It's not about compilation, it's about seeing that this code might be shared.

When e.g. changing a file under arch/i386/kernel/cpu/mtrr/ it's highly surprising that this file might also be used on x86_64.

Quoted 1 line

-Andi

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#21 lore raw
In reply to Andi Kleen
Quoted 8 lines · Andi Kleen
Quoted 4 lines

It happens so often that someone accidentally breaks one architecture because he didn't notice the code also gets used on the other architecture.

That's not changing at all. Especially with even more sharing, (than I think would be prudent) like Thomas treated, you'll likely have to test compile both for most changes.

And a shared code base makes it entirely clear, that you must recheck bot ARCHs when you touch code in there.

Right now it is not clear at all.

tglx

#22 lore raw
In reply to Andi Kleen
Quoted 7 lines · Andi Kleen
Quoted 3 lines

It happens so often that someone accidentally breaks one architecture because he didn't notice the code also gets used on the other architecture.

That's not changing at all. Especially with even more sharing, (than I think would be prudent) like Thomas treated, you'll likely have to test compile both for most changes.

yes, very much so, and that's exactly one of our points.

Ingo

#23 lore raw
In reply to Andi Kleen

Hi!

Quoted 7 lines
Quoted 4 lines

This patch was the beginning of the merger, not the end result. It strived for binary identical images. It was to put everything together as a
_starting_point_! The next thing to do after this is to start the
merging.

Well we've been merging what makes sense since several years. So it's not really starting anything that hasn't already occurred.

I believe there's still a lot that can be merged, and I'm responsible for some of it. Parts of suspend code should be shared, yet they are in differently named files in differently named directories.

Ok, I guess I should fix it, arch/x86 or not.
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#24 lore raw
Quoted 5 lines · * Pavel Machek ([email protected]) wrote:

I believe there's still a lot that can be merged, and I'm responsible for some of it. Parts of suspend code should be shared, yet they are in differently named files in differently named directories.

Ok, I guess I should fix it, arch/x86 or not.

Funny, I was just looking at that code specifically. Yes, it would be useful to share. It will need some wrappers for the asm which are now paravirt on i386 and still raw on x86_64 (have those handy if you need them).

thanks,
-chris

#25 lore raw
In reply to Thomas Gleixner
Quoted 4 lines · Thomas Gleixner

The topic of sharing more x86 code has been discussed on LKML a number of times. Various approaches were discussed and we decided to advance the discussion by implementing a full solution that brings the transition to a shared tree to completion.

Great stuff. I've worked on doing the same for s390 and powerpc in the past, and really think it's the right thing to do. I've even started my own x86 merge two or three times in the past but never got very far because of the quickly moving source.

Quoted 5 lines

In this initial implementation the old arch/i386 and arch/x86_64 trees are removed _immediately_, in the same commit, and all future x86 development goes on in the new, shared tree. So the transition right now is one atomic operation.

Quoted 7 lines

As a next step we plan to generate a gradual, fully bisectable, fully working switchover from the current code to the fully populated arch/x86 tree. It will result in about 1000-2000 commits. We are releasing our current solution because it 100% represents the finally resulting arch/x86 source tree already, and we first wanted to make sure that the new architecture layout works fine and folks are happy before we go and do the (even more complex) fine-grained work.

I don't think it's really good to do it this way, or maybe I'm still misunderstanding where you're going. If you really want to end up with the exact set of files that you have your tree now, I see absolutely zero point in making it bisectable. On the contrary, there is nothing particularly complicated in it, so once it has seen some amount of testing it can better get merged in one big changeset. I'm just not convinced that it actully is what we want to end up with.

In my experience, it's very helpful to have a single set of header files, and merging the two versions of one header usually exposes bugs that have been fixed in only one of the two, so you get to fix actual bugs in the process.

In the s390 merge, I also started out in an attempt to guarantee unchanged object files, much like what you describe. However, it turned out that fixing it in the process is actually easier. Either way, 'diff -D __x86_64__' is a great tool for a start, you should try it out to see how easy it is to merge a lot of files.

To put it into perspective, I think the s390 merge was a lot easier than the x86 merge, because there is only a very limited set of hardware configurations for s390 compared to others. We ended up doing the full merge with three people within less than a week and no separate files at all.

OTOH, the powerpc merge is now going into its third year, mostly because it was started with the intention to remove all cruft in the process and to only allow sane code into the new architecture.

The steps that I'd suggest instead are:

* merge all exported header files of the two architectures. This alone is a worthy goal, because it allows us to get rid of the ugly code for deciding which version to use in installed headers and elsewhere.

* Merge the remaining header files, to end up with a single include/asm-x86 directory.

* Come up with a model that integrates the machine type selection of i386 with the way we build things on x86_64. One way would be to make X86_64 another platform next to X86_PC, X86_VOYAGER and the others.

* Create an arch/x86/Kconfig that handles the new common configuration

* Create an arch/x86/Makefile that descends into ../i386/* and ../x86_64/* instead of its subdirectories.

* Merge the arch/x86/* subdirectories, one at a time, starting with the low-hanging fruit like oprofile or pci, and do the hard ones like mm and kernel last.

Unfortunately, I don't think I'll spend much time on this, so I don't get to decide on it, but you asked for feedback ;-)

	Arnd <><
#26 lore raw
Quoted 7 lines · Arnd Bergmann

On Saturday 21 July 2007, Thomas Gleixner wrote:

In my experience, it's very helpful to have a single set of header files, and merging the two versions of one header usually exposes bugs that have been fixed in only one of the two, so you get to fix actual bugs in the process.

This can still be done after the merge tglx did.

Quoted 7 lines

In the s390 merge, I also started out in an attempt to guarantee unchanged object files, much like what you describe. However, it turned out that fixing it in the process is actually easier. Either way, 'diff -D __x86_64__' is a great tool for a start, you should try it out to see how easy it is to merge a lot of files.

Quoted 5 lines

To put it into perspective, I think the s390 merge was a lot easier than the x86 merge, because there is only a very limited set of hardware configurations for s390 compared to others. We ended up doing the full merge with three people within less than a week and no separate files at all.

This is the big reason they wanted to keep it binary identical. Since there are just way too many different configs out there in the x86 world

Quoted 4 lines

OTOH, the powerpc merge is now going into its third year, mostly because it was started with the intention to remove all cruft in the process and to only allow sane code into the new architecture.

I'd expect x86 to move much faster, just because there are more developers and users of x86 PCs than there are for powerpc.

Quoted 7 lines

The steps that I'd suggest instead are:

* merge all exported header files of the two architectures. This alone is a worthy goal, because it allows us to get rid of the ugly code for deciding which version to use in installed headers and elsewhere.

I don't see why this can't be done after the first "Big" merge.

Quoted 3 lines

* Create an arch/x86/Makefile that descends into ../i386/* and ../x86_64/* instead of its subdirectories.

The thing that Thomas pointed out, is that physical location of the source actually does matter. Having two files side by side with the same name except for a _32.c and _64.c, makes a developer want to merge them.

A perfect example is looking at both
arch/x86/kernel/module_{32,64}.c
One would be encouraged to make that into a single file. But having a arch/i386/kernel/module.c and a arch/x86_64/kernel/module.c would take some time before anyone would care.

Quoted 4 lines

* Merge the arch/x86/* subdirectories, one at a time, starting with the low-hanging fruit like oprofile or pci, and do the hard ones like mm and kernel last.

Your looking at a 10year plus merge with that approach. I think that is exactly what Ingo and Thomas _dont_ want. Doing it as the big bang way as is posted in this patch is the fastest way to get where we want to go.

Quoted 4 lines

Unfortunately, I don't think I'll spend much time on this, so I don't get to decide on it, but you asked for feedback ;-)

I'm actually looking forward to helping out here ;-)

-- Steve

#27 lore raw
In reply to Thomas Gleixner
Quoted 1 line · Thomas Gleixner

[...]

Quoted 1 line

As usual, comments and suggestions are welcome!

Compiles and boots fine here ( on my Dell Precision WorkStation 530 MT ). And nothing broke so far.

I only got some Kconfig warnings[1] with my config[2] but that is.

( I don't know whatever this matter but it boots 7,52 seconds faster as current git head )

[1]http://194.231.229.228/linux-x86/warning
[2]http://194.231.229.228/linux-x86/config-x86

Quoted 4 lines

Thomas, Ingo

Regards,

Gabriel C

#28 lore raw
In reply to Thomas Gleixner
Quoted 3 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

Well you know my position on this. I think it's a bad idea because it means we can never get rid of any old junk. IMNSHO arch/x86_64 is significantly cleaner and simpler in many ways than arch/i386 and I would like to preserve that. Also in general arch/x86_64 is much easier to hack than arch/i386 because it's easier to regression test and in general has to care about much less junk. And I don't
know of any way to ever fix that for i386 besides splitting the old stuff off completely.

Besides radical file movements like this are bad anyways. They cause a big break in patchkits and forward/backwards porting that doesn't really help anybody.

Quoted 4 lines

This causes double maintenance
even for functionality that is conceptually the same for the 32-bit and the 64-bit tree. (such as support for standard PC platform architecture devices)

It's not really the same platform: one is PC hardware going back forever with zillions of bugs, the other is modern PC platforms which much less bugs and quirks

To see it otherwise it's more a junkification of arch/x86_64 than a cleanup of arch/i386 -- in fact you didn't really clean up arch/i386 at all.

Quoted 5 lines

How did we do it?
-----------------

As an initial matter, we made it painstakingly sure that the resulting .o files in a 32-bit build are bit for bit equal.

You got not a single line less code duplication then, so i don't really see the point of this.

-Andi

#29 lore raw
Quoted 5 lines · Andi Kleen
Quoted 3 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

Quoted 8 lines

Well you know my position on this. I think it's a bad idea because it means we can never get rid of any old junk. IMNSHO arch/x86_64 is significantly cleaner and simpler in many ways than arch/i386 and I would like to preserve that. Also in general arch/x86_64 is much easier to hack than arch/i386 because it's easier to regression test and in general has to care about much less junk. And I don't
know of any way to ever fix that for i386 besides splitting the old stuff off completely.

I have to say honestly that it is much easier to work in the i386 arch directories than the x86_64. But that may be my own feelings. You seem to have a nice style that you like and think that it is cleaner. But it doesn't really seem much cleaner to me. Somethings I like better with the x86_64 code, and there's somethings I like better with the i386 code. But from a comfort level, I have to go with worknig with the i386 code.

Quoted 4 lines

Besides radical file movements like this are bad anyways. They cause a big break in patchkits and forward/backwards porting that doesn't really help anybody.

I think it helps a lot of people. Especially those that are trying to add things to _both_ i386 and x86_64.

Quoted 5 lines
Quoted 5 lines

This causes double maintenance
even for functionality that is conceptually the same for the 32-bit and the 64-bit tree. (such as support for standard PC platform architecture devices)

Not sure what you mean here? I would think that we have this "double maintence" anyway. Fixes that are done in x86_64 probably should also be done in i386. Why have it in two places?

Quoted 4 lines

It's not really the same platform: one is PC hardware going back forever with zillions of bugs, the other is modern PC platforms which much less bugs and quirks

hehe, I'm seeing a bunch of bugs and quirks appear. It's just that x86_64 isn't as old as i386 to have as many of them. But give it time.

Quoted 4 lines

To see it otherwise it's more a junkification of arch/x86_64 than a cleanup of arch/i386 -- in fact you didn't really clean up arch/i386 at all.

That was not the point of this patch. This patch was to unify the two so that we can get started on the unification.

Quoted 10 lines
Quoted 6 lines

How did we do it?
-----------------

As an initial matter, we made it painstakingly sure that the resulting .o files in a 32-bit build are bit for bit equal.

You got not a single line less code duplication then, so i don't really see the point of this.

Did you read what tglx wrote? The point of this patch was to keep everything the _same_. The fact that not a single line less code duplication is a feature. A great starting point where we can easily trace things back to the current arch separation, as well as move forward in merging the two.

-- Steve

#30 lore raw
Quoted 7 lines
Quoted 4 lines

It's not really the same platform: one is PC hardware going back forever with zillions of bugs, the other is modern PC platforms which much less bugs and quirks

hehe, I'm seeing a bunch of bugs and quirks appear. It's just that x86_64 isn't as old as i386 to have as many of them. But give it time.

It will always fundamentally always have less bugs and quirks than i386 because it's much younger. Modern x86 is significantly different than traditional x86 and in the old days hardware wasn't really tested for the now modern interfaces, so they tended to have a lot of bugs and quirks.

-Andi

#31 lore raw
In reply to Andi Kleen
Quoted 5 lines · Andi Kleen
Quoted 3 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

Quoted 8 lines

Well you know my position on this. I think it's a bad idea because it means we can never get rid of any old junk. IMNSHO arch/x86_64 is significantly cleaner and simpler in many ways than arch/i386 and I would like to preserve that. Also in general arch/x86_64 is much easier to hack than arch/i386 because it's easier to regression test and in general has to care about much less junk. And I don't
know of any way to ever fix that for i386 besides splitting the old stuff off completely.

I disagree of course.

I worked on both trees quite intensive over the last years and I broke x86_64 more than once when hacking on i386 and vice versa.

Your "junk" argument is nothing else than a strawman which you beat on every time when this discussion comes up.

Quoted 3 lines

Besides radical file movements like this are bad anyways. They cause a big break in patchkits and forward/backwards porting that doesn't really help anybody.

Interestingly enough the folks with the big patch kits (Virtualization) would be quite happy about that move.

Quoted 8 lines
Quoted 4 lines

This causes double maintenance
even for functionality that is conceptually the same for the 32-bit and the 64-bit tree. (such as support for standard PC platform architecture devices)

It's not really the same platform: one is PC hardware going back forever with zillions of bugs, the other is modern PC platforms which much less bugs and quirks

It _IS_ the same platform. x86_64 is PC hardware with zillions of bugs as well. And it is not modern at all. It is nothing else than a 64 bit version of the legacy x86.

Quoted 3 lines

To see it otherwise it's more a junkification of arch/x86_64 than a cleanup of arch/i386 -- in fact you didn't really clean up arch/i386 at all.

We went for a 1 : 1 replacement without merging anything which is not obvious in the first place (identical files and files, which are just including some other file). That way we were able to do a binary compatible migration.

The clean up is the next step and there are enough folks out there willing to help on this.

Quoted 5 lines
Quoted 2 lines

As an initial matter, we made it painstakingly sure that the resulting .o files in a 32-bit build are bit for bit equal.

You got not a single line less code duplication then, so i don't really see the point of this.

Really ?

The script detected 15 identical files with a simple cmp.

It also unified another 10 by simply looking at the only line in there "include <the other arch/file>"

And there is more of that, when you take the time and look closely at the _32.[ch] _64.[ch] files which are created by the merge.

tglx

#32 lore raw
Quoted 2 lines · On Saturday 21 July 2007 10:15:50 Thomas Gleixner wrote:

The script detected 15 identical files with a simple cmp.

You mean

arch/i386/boot/.gitignore
arch/i386/boot/tools/.gitignore
arch/i386/oprofile/Kconfig
include/asm-i386/poll.h
include/asm-i386/emergency-restart.h
include/asm-i386/spinlock_types.h
include/asm-i386/vga.h
include/asm-i386/msidef.h
include/asm-i386/hypertransport.h
include/asm-i386/ioctl.h
include/asm-i386/fcntl.h

?

[of which several just #include <asm-generic/foo.h] ?

I suppose msidef.h and hypertransport.h should be shared agreed; for the others it is not obvious. spinlock_types will likely fork soon; it used to be different in the past already and will be again.

-Andi

#33 lore raw
Quoted 5 lines · Andi Kleen

[of which several just #include <asm-generic/foo.h] ?

I suppose msidef.h and hypertransport.h should be shared agreed; for the others it is not obvious. spinlock_types will likely fork soon; it used to be different in the past already and will be again.

Why will it fork? I don't think it will ever happen that the trees will have large pieces that _has_ to be different one from the other. So if it's forking to achieve some benefits, why can't i386 get the benefits too? I think this is the whole point here.

Surely as it is today (and just because it wasn't merged earlier and the past!), the x86_64 tree has a bunch of things that are quite better structured than the i386 (and maybe vice-versa, but I must admit that unlike Steven Roasted, I like the x86_64 a lot more). But in the long term, it tends to just get the best of each picked up.

And oh yeah, i386 is older, has a lot more corner cases, but even if it does count against the merge, we have a net win at the end.

Signature · 5 lines
Glauber de Oliveira Costa.
"Free as in Freedom"
http://glommer.net

"The less confident you are, the more serious you have to act."
#34 lore raw
In reply to Thomas Gleixner
Quoted 15 lines · Thomas Gleixner
Quoted 5 lines · Andi Kleen
Quoted 3 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

Quoted 8 lines

Well you know my position on this. I think it's a bad idea because it means we can never get rid of any old junk. IMNSHO arch/x86_64 is significantly cleaner and simpler in many ways than arch/i386 and I would like to preserve that. Also in general arch/x86_64 is much easier to hack than arch/i386 because it's easier to regression test and in general has to care about much less junk. And I don't
know of any way to ever fix that for i386 besides splitting the old stuff off completely.

Quoted 4 lines

I disagree of course.

I worked on both trees quite intensive over the last years and I broke x86_64 more than once when hacking on i386 and vice versa.

Me too.

At the very least I'd like to see asm-x86/ for headers used by both.

That said, the merge is exactly as I'd have done it. So if this were a democracy, I'd vote in favour.

Cheers,
Rusty.

#35 lore raw
In reply to Thomas Gleixner
Quoted 9 lines · Thomas Gleixner
Quoted 5 lines · Andi Kleen
Quoted 2 lines · Thomas Gleixner

As an initial matter, we made it painstakingly sure that the resulting .o files in a 32-bit build are bit for bit equal.

You got not a single line less code duplication then, so i don't really see the point of this.

Really ?

Quoted 7 lines

The script detected 15 identical files with a simple cmp.

It also unified another 10 by simply looking at the only line in there "include <the other arch/file>"

And there is more of that, when you take the time and look closely at the _32.[ch] _64.[ch] files which are created by the merge.

Looking at the include files, many more are near-identical in trivial ways, such as whitespace, comments, local variable names, or guard #ifdefs.

--
Brian Gerst

#36 lore raw
Quoted 6 lines · Brian Gerst
Quoted 2 lines

And there is more of that, when you take the time and look closely at the _32.[ch] _64.[ch] files which are created by the merge.

Looking at the include files, many more are near-identical in trivial ways, such as whitespace, comments, local variable names, or guard #ifdefs.

yeah. And by moving them next to each other, people actually have the real incentive to look and ponder: "these two files do similar things but they look so different. Does it _have_ to be so?". Often the answer
is: no, it could really be shared.

And even when things will continue to be different, it's nice to have them side by side for documentation purposes as well. "we do this differently on 64-bit, because ...".

Key to starting all these cleanups is to create plain and simple physical proximity - and our transition arch/x86 and include/asm-x86 achieves that - nothing more, nothing less.

Ingo

#37 lore raw
In reply to Andi Kleen
Quoted 4 lines

Besides radical file movements like this are bad anyways. They cause a big break in patchkits and forward/backwards porting that doesn't really help anybody.

Sorry Andi but I strongly disagree with your disapproval of this.

for existing out of tree patches it's not a big break, it's one sed script away (until consolidation happens).

For distro backports... well that's a distro problem; the distros get paid to do that work by their customers. We really can't hold back mainline progress for that....

Having one tree is a lot of progress; it means we (Intel and the rest of the kernel community) only have to add features, bugfixes and quirks to one place. It means testing is shared. It means feature sets are shared.

The only argument against is "but there are quirks in the old one that I don't want to see".. well Thomas solves that by having a clean way to do per 32/64 files for the few cases where it's needed.

Signature · 2 lines
if you want to mail me at work (you don't), use arjan (at) linux.intel.com
Test the interaction between Linux and your BIOS via http://www.linuxfirmwarekit.org
#38 lore raw
In reply to Thomas Gleixner
Quoted 4 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

kvm will really like this. while kvm will always have #ifdefs for i386 and x86_64, this work will reduce them, and will make kvm code cleaner. Of course, I also believe it makes sense from the non-kvm-centric point of view.

Thanks for doing this!

Signature · 1 line
Do not meddle in the internals of kernels, for they are subtle and quick to panic.
#39 lore raw
In reply to Thomas Gleixner
Quoted 3 lines · Thomas Gleixner

We are pleased to announce a project we've been working on for some
time: the unified x86 architecture tree, or "arch/x86" - and we'd like to solicit feedback about it.

Oooh, shiny. We've been talking about how useful this would be for years. Experience with the unification of PowerPC shows that it's definitely the right thing to do -- it reduces the number of gratuitous differences between 32-bit and 64-bit code, and makes it far more easier to ensure that bug-fixes and new features get added to both at the same time.

Quoted 4 lines

When should this go upstream?
-----------------------------

We actually think that the sooner we get over with this, the better.

I'm inclined to agree.

Signature · 1 line
dwmw2
#40 lore raw
In reply to Thomas Gleixner

Thanks for doing this, it's definitely the way to go.

After a quick look over it, I noted a small mistake:
After the arch/x86_64/kernel/Makefile -> arch/x86/kernel/Makefile_64 transition, the three foo-$(subst m,y,$(CONFIG_BAR)) got replaced with foo-$(CONFIG_BAR).

Although the subst's look fishy, such changes shouldn't be part of the architecture merge.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#41 lore raw
In reply to Thomas Gleixner
Quoted 6 lines · Thomas Gleixner

How is the new arch/x86 and include/asm-x86 namespace layed out? Our foremost concern was to enable a 100% smooth transition to the new, shared architecture, while still enabling much more fine-grained future unification of the source code. To do this we consciously aimed for the strictest possible unification strategy: we only 'unified' those source files that are already bit for bit equal between the two architectures

Quoted 8 lines

today. For all other files we used the following rule: if a file came from arch/i386/foo/bar.c, it gets moved to arch/x86/foo/bar_32.c, if it came from arch/x86_64/foo/bar.c it gets moved to arch/x86/foo/bar_64.c. We also generated arch/x86/foo/bar.c that simply #include's those two files (depending on whether we do a 32-bit or a 64-bit built). If a file only existed in only one of the architectures, it's moved to arch/x86/foo/bar.c straight away. (take a look at our git repository to see how this works out in practice.)

Can we see some stats on:

How many files were auto-merged?
How many files got 32.c and 64.c extensions?
How many existed only in one arch?

Signature · 1 line
Mathematics is the supreme nostalgia of our time.
#42 lore raw
Quoted 5 lines · * Matt Mackall ([email protected]) wrote:

Can we see some stats on:

How many files were auto-merged?
How many files got 32.c and 64.c extensions?
How many existed only in one arch?

It's mostly about file movement first.

 Kbuild                                             |    8 +-
 Makefile                                           |   23 +-
 arch/i386/Kconfig                                  | 1275 +-------------
 arch/i386/Makefile                                 |  208 +--
 arch/i386/kernel/early_printk.c                    |    2 -
 arch/i386/kernel/tsc_sync.c                        |    1 -
 arch/x86/Kconfig                                   | 1919 ++++++++++++++++++++
 arch/{i386 => x86}/Kconfig.cpu                     |    0 
 arch/{i386 => x86}/Kconfig.debug                   |   50 +-
 arch/x86/Kconfig_32                                | 1283 +++++++++++++
 arch/{i386/Kconfig.debug => x86/Kconfig_32.debug}  |    0 
 arch/x86/Kconfig_64                                |  792 ++++++++
 .../{x86_64/Kconfig.debug => x86/Kconfig_64.debug} |    0 
 arch/x86/Makefile                                  |    5 +
 arch/{i386 => x86}/Makefile.cpu                    |    0 
 arch/x86/Makefile_32                               |  163 ++
 arch/x86/Makefile_64                               |  128 ++
 arch/{i386 => x86}/boot/.gitignore                 |    0 
 arch/{i386 => x86}/boot/Makefile                   |    6 +-
 arch/{i386 => x86}/boot/a20.c                      |    0 
 arch/{i386 => x86}/boot/apm.c                      |    0 
 arch/{i386 => x86}/boot/bitops.h                   |    0 
 arch/{i386 => x86}/boot/boot.h                     |    0 
 arch/{i386 => x86}/boot/cmdline.c                  |    0 
 arch/{i386 => x86}/boot/code16gcc.h                |    0 
 arch/{i386 => x86}/boot/compressed/.gitignore      |    0 
 arch/x86/boot/compressed/Makefile                  |    5 +
 .../Makefile => x86/boot/compressed/Makefile_32}   |    8 +-
 .../Makefile => x86/boot/compressed/Makefile_64}   |    8 +-
 .../head.S => x86/boot/compressed/head_32.S}       |    0 
 .../head.S => x86/boot/compressed/head_64.S}       |    0 
 .../misc.c => x86/boot/compressed/misc_32.c}       |    0 
 .../misc.c => x86/boot/compressed/misc_64.c}       |    0 
 arch/{i386 => x86}/boot/compressed/relocs.c        |    0 
 .../boot/compressed/vmlinux_32.lds}                |    0 
 .../boot/compressed/vmlinux_32.scr}                |    0 
 .../boot/compressed/vmlinux_64.lds}                |    0 
 .../boot/compressed/vmlinux_64.scr}                |    0 
 arch/{i386 => x86}/boot/copy.S                     |    0 
 arch/{i386 => x86}/boot/cpu.c                      |    0 
 arch/{i386 => x86}/boot/cpucheck.c                 |    0 
 arch/{i386 => x86}/boot/edd.c                      |    0 
 arch/{i386 => x86}/boot/header.S                   |    0 
 arch/{i386 => x86}/boot/install.sh                 |    0 
 arch/{i386 => x86}/boot/main.c                     |    0 
 arch/{i386 => x86}/boot/mca.c                      |    0 
 arch/{i386 => x86}/boot/memory.c                   |    0 
 arch/{i386 => x86}/boot/mtools.conf.in             |    0 
 arch/{i386 => x86}/boot/pm.c                       |    0 
 arch/{i386 => x86}/boot/pmjump.S                   |    0 
 arch/{i386 => x86}/boot/printf.c                   |    0 
 arch/x86/boot/setup.S                              |    7 +
 arch/{i386 => x86}/boot/setup.ld                   |    0 
 arch/{i386 => x86}/boot/string.c                   |    0 
 arch/{i386 => x86}/boot/tools/.gitignore           |    0 
 arch/{i386 => x86}/boot/tools/build.c              |    0 
 arch/{i386 => x86}/boot/tty.c                      |    0 
 arch/{i386 => x86}/boot/version.c                  |    0 
 arch/{i386 => x86}/boot/vesa.h                     |    0 
 arch/{i386 => x86}/boot/video-bios.c               |    0 
 arch/{i386 => x86}/boot/video-vesa.c               |    0 
 arch/{i386 => x86}/boot/video-vga.c                |    0 
 arch/{i386 => x86}/boot/video.c                    |    0 
 arch/{i386 => x86}/boot/video.h                    |    0 
 arch/{i386 => x86}/boot/voyager.c                  |    0 
 arch/x86/crypto/Makefile                           |    5 +
 .../crypto/Makefile => x86/crypto/Makefile_32}     |    4 +-
 .../crypto/Makefile => x86/crypto/Makefile_64}     |    4 +-
 arch/{i386 => x86}/crypto/aes-i586-asm.S           |    0 
 arch/{x86_64 => x86}/crypto/aes-x86_64-asm.S       |    0 
 arch/{i386/crypto/aes.c => x86/crypto/aes_32.c}    |    0 
 arch/{x86_64/crypto/aes.c => x86/crypto/aes_64.c}  |    0 
 arch/{i386 => x86}/crypto/twofish-i586-asm.S       |    0 
 arch/{x86_64 => x86}/crypto/twofish-x86_64-asm.S   |    0 
 .../crypto/twofish.c => x86/crypto/twofish_32.c}   |    0 
 .../crypto/twofish.c => x86/crypto/twofish_64.c}   |    0 
 arch/{i386/defconfig => x86/defconfig_32}          |    0 
 arch/{x86_64/defconfig => x86/defconfig_64}        |    0 
 arch/{x86_64 => x86}/ia32/Makefile                 |    0 
 arch/{x86_64 => x86}/ia32/audit.c                  |    2 +-
 arch/{x86_64 => x86}/ia32/fpu32.c                  |    0 
 arch/{x86_64 => x86}/ia32/ia32_aout.c              |    0 
 arch/{x86_64 => x86}/ia32/ia32_binfmt.c            |    0 
 arch/{x86_64 => x86}/ia32/ia32_signal.c            |    0 
 arch/{x86_64 => x86}/ia32/ia32entry.S              |    0 
 arch/{x86_64 => x86}/ia32/ipc32.c                  |    2 +-
 arch/{x86_64 => x86}/ia32/mmap32.c                 |    0 
 arch/{x86_64 => x86}/ia32/ptrace32.c               |    0 
 arch/{x86_64 => x86}/ia32/sys_ia32.c               |    0 
 arch/{x86_64 => x86}/ia32/syscall32.c              |    0 
 arch/{x86_64 => x86}/ia32/syscall32_syscall.S      |    4 +-
 arch/{x86_64 => x86}/ia32/tls32.c                  |    0 
 arch/{x86_64 => x86}/ia32/vsyscall-sigreturn.S     |    2 +-
 arch/{x86_64 => x86}/ia32/vsyscall-syscall.S       |    0 
 arch/{x86_64 => x86}/ia32/vsyscall-sysenter.S      |    0 
 arch/{x86_64 => x86}/ia32/vsyscall.lds             |    0 
 arch/{i386 => x86}/kernel/.gitignore               |    0 
 arch/x86/kernel/Makefile                           |    5 +
 .../kernel/Makefile => x86/kernel/Makefile_32}     |   40 +-
 arch/x86/kernel/Makefile_64                        |   55 +
 arch/x86/kernel/acpi/Makefile                      |    5 +
 .../acpi/Makefile => x86/kernel/acpi/Makefile_32}  |    2 +-
 arch/x86/kernel/acpi/Makefile_64                   |    7 +
 arch/{i386 => x86}/kernel/acpi/boot.c              |    0 
 arch/{i386 => x86}/kernel/acpi/cstate.c            |    0 
 arch/{i386 => x86}/kernel/acpi/earlyquirk.c        |    0 
 arch/{i386 => x86}/kernel/acpi/processor.c         |    0 
 .../acpi/sleep.c => x86/kernel/acpi/sleep_32.c}    |    0 
 .../acpi/sleep.c => x86/kernel/acpi/sleep_64.c}    |    0 
 .../acpi/wakeup.S => x86/kernel/acpi/wakeup_32.S}  |    0 
 .../acpi/wakeup.S => x86/kernel/acpi/wakeup_64.S}  |    0 
 arch/{i386 => x86}/kernel/alternative.c            |    0 
 arch/{x86_64 => x86}/kernel/aperture.c             |    0 
 arch/{i386/kernel/apic.c => x86/kernel/apic_32.c}  |    0 
 .../{x86_64/kernel/apic.c => x86/kernel/apic_64.c} |    0 
 arch/{i386 => x86}/kernel/apm.c                    |    0 
 arch/x86/kernel/asm-offsets.c                      |    7 +
 .../asm-offsets.c => x86/kernel/asm-offsets_32.c}  |    0 
 .../asm-offsets.c => x86/kernel/asm-offsets_64.c}  |    0 
 arch/{x86_64 => x86}/kernel/audit.c                |    0 
 arch/{i386 => x86}/kernel/bootflag.c               |    0 
 arch/{x86_64 => x86}/kernel/bugs.c                 |    0 
 arch/{i386 => x86}/kernel/cpu/Makefile             |    0 
 .../kernel/cpu/addon_cpuid_features.c              |    0 
 arch/{i386 => x86}/kernel/cpu/amd.c                |    0 
 arch/{i386 => x86}/kernel/cpu/bugs.c               |    0 
 arch/{i386 => x86}/kernel/cpu/centaur.c            |    0 
 arch/{i386 => x86}/kernel/cpu/common.c             |    0 
 arch/{i386 => x86}/kernel/cpu/cpu.h                |    0 
 arch/{i386 => x86}/kernel/cpu/cpufreq/Kconfig      |   90 +-
 .../Kconfig => x86/kernel/cpu/cpufreq/Kconfig_32}  |    0 
 .../Kconfig => x86/kernel/cpu/cpufreq/Kconfig_64}  |    0 
 arch/{i386 => x86}/kernel/cpu/cpufreq/Makefile     |    0 
 .../kernel/cpu/cpufreq/acpi-cpufreq.c              |    0 
 .../kernel/cpu/cpufreq/cpufreq-nforce2.c           |    0 
 .../kernel/cpu/cpufreq/e_powersaver.c              |    0 
 arch/{i386 => x86}/kernel/cpu/cpufreq/elanfreq.c   |    0 
 arch/{i386 => x86}/kernel/cpu/cpufreq/gx-suspmod.c |    0 
 arch/{i386 => x86}/kernel/cpu/cpufreq/longhaul.c   |    0 
 arch/{i386 => x86}/kernel/cpu/cpufreq/longhaul.h   |    0 
 arch/{i386 => x86}/kernel/cpu/cpufreq/longrun.c    |    0 
 .../{i386 => x86}/kernel/cpu/cpufreq/p4-clockmod.c |    0 
 .../{i386 => x86}/kernel/cpu/cpufreq/powernow-k6.c |    0 
 .../{i386 => x86}/kernel/cpu/cpufreq/powernow-k7.c |    0 
 .../{i386 => x86}/kernel/cpu/cpufreq/powernow-k7.h |    0 
 .../{i386 => x86}/kernel/cpu/cpufreq/powernow-k8.c |    0 
 .../{i386 => x86}/kernel/cpu/cpufreq/powernow-k8.h |    0 
 arch/{i386 => x86}/kernel/cpu/cpufreq/sc520_freq.c |    0 
 .../kernel/cpu/cpufreq/speedstep-centrino.c        |    0 
 .../kernel/cpu/cpufreq/speedstep-ich.c             |    0 
 .../kernel/cpu/cpufreq/speedstep-lib.c             |    0 
 .../kernel/cpu/cpufreq/speedstep-lib.h             |    0 
 .../kernel/cpu/cpufreq/speedstep-smi.c             |    0 
 arch/{i386 => x86}/kernel/cpu/cyrix.c              |    0 
 arch/{i386 => x86}/kernel/cpu/intel.c              |    0 
 arch/{i386 => x86}/kernel/cpu/intel_cacheinfo.c    |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/Makefile      |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/k7.c          |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/mce.c         |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/mce.h         |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/non-fatal.c   |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/p4.c          |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/p5.c          |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/p6.c          |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/therm_throt.c |    0 
 arch/{i386 => x86}/kernel/cpu/mcheck/winchip.c     |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/Makefile        |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/amd.c           |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/centaur.c       |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/cyrix.c         |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/generic.c       |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/if.c            |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/main.c          |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/mtrr.h          |    0 
 arch/{i386 => x86}/kernel/cpu/mtrr/state.c         |    0 
 arch/{i386 => x86}/kernel/cpu/nexgen.c             |    0 
 arch/{i386 => x86}/kernel/cpu/perfctr-watchdog.c   |    0 
 arch/{i386 => x86}/kernel/cpu/proc.c               |    0 
 arch/{i386 => x86}/kernel/cpu/rise.c               |    0 
 arch/{i386 => x86}/kernel/cpu/transmeta.c          |    0 
 arch/{i386 => x86}/kernel/cpu/umc.c                |    0 
 arch/{x86_64 => x86}/kernel/cpufreq/Makefile       |    2 +-
 arch/{i386 => x86}/kernel/cpuid.c                  |    0 
 .../{i386/kernel/crash.c => x86/kernel/crash_32.c} |    0 
 .../kernel/crash.c => x86/kernel/crash_64.c}       |    0 
 .../crash_dump.c => x86/kernel/crash_dump_32.c}    |    0 
 .../crash_dump.c => x86/kernel/crash_dump_64.c}    |    0 
 arch/{i386 => x86}/kernel/doublefault.c            |    0 
 arch/{i386/kernel/e820.c => x86/kernel/e820_32.c}  |    0 
 .../{x86_64/kernel/e820.c => x86/kernel/e820_64.c} |    0 
 arch/{x86_64 => x86}/kernel/early-quirks.c         |    0 
 arch/{x86_64 => x86}/kernel/early_printk.c         |    0 
 arch/{i386 => x86}/kernel/efi.c                    |    0 
 arch/{i386 => x86}/kernel/efi_stub.S               |    0 
 .../{i386/kernel/entry.S => x86/kernel/entry_32.S} |    0 
 .../kernel/entry.S => x86/kernel/entry_64.S}       |    0 
 arch/{x86_64 => x86}/kernel/genapic.c              |    0 
 arch/{x86_64 => x86}/kernel/genapic_flat.c         |    0 
 arch/{x86_64 => x86}/kernel/head64.c               |    0 
 arch/{i386/kernel/head.S => x86/kernel/head_32.S}  |    0 
 .../{x86_64/kernel/head.S => x86/kernel/head_64.S} |    0 
 arch/{i386/kernel/hpet.c => x86/kernel/hpet_32.c}  |    0 
 .../{x86_64/kernel/hpet.c => x86/kernel/hpet_64.c} |    0 
 arch/{i386 => x86}/kernel/i386_ksyms.c             |    0 
 arch/{i386/kernel/i387.c => x86/kernel/i387_32.c}  |    0 
 .../{x86_64/kernel/i387.c => x86/kernel/i387_64.c} |    0 
 arch/{i386 => x86}/kernel/i8237.c                  |    0 
 arch/{i386 => x86}/kernel/i8253.c                  |    0 
 .../{i386/kernel/i8259.c => x86/kernel/i8259_32.c} |    0 
 .../kernel/i8259.c => x86/kernel/i8259_64.c}       |    0 
 .../init_task.c => x86/kernel/init_task_32.c}      |    0 
 .../init_task.c => x86/kernel/init_task_64.c}      |    0 
 .../kernel/io_apic.c => x86/kernel/io_apic_32.c}   |    0 
 .../kernel/io_apic.c => x86/kernel/io_apic_64.c}   |    0 
 .../kernel/ioport.c => x86/kernel/ioport_32.c}     |    0 
 .../kernel/ioport.c => x86/kernel/ioport_64.c}     |    0 
 arch/{i386/kernel/irq.c => x86/kernel/irq_32.c}    |    0 
 arch/{x86_64/kernel/irq.c => x86/kernel/irq_64.c}  |    0 
 arch/{x86_64 => x86}/kernel/k8.c                   |    0 
 .../kernel/kprobes.c => x86/kernel/kprobes_32.c}   |    0 
 .../kernel/kprobes.c => x86/kernel/kprobes_64.c}   |    0 
 arch/{i386/kernel/ldt.c => x86/kernel/ldt_32.c}    |    0 
 arch/{x86_64/kernel/ldt.c => x86/kernel/ldt_64.c}  |    0 
 arch/{i386 => x86}/kernel/legacy_serial.c          |    0 
 .../kernel/machine_kexec_32.c}                     |    0 
 .../kernel/machine_kexec_64.c}                     |    0 
 arch/{i386 => x86}/kernel/mca.c                    |    0 
 arch/{x86_64 => x86}/kernel/mce.c                  |    0 
 arch/{x86_64 => x86}/kernel/mce_amd.c              |    0 
 arch/{x86_64 => x86}/kernel/mce_intel.c            |    0 
 arch/{i386 => x86}/kernel/microcode.c              |    0 
 .../kernel/module.c => x86/kernel/module_32.c}     |    0 
 .../kernel/module.c => x86/kernel/module_64.c}     |    0 
 .../kernel/mpparse.c => x86/kernel/mpparse_32.c}   |    0 
 .../kernel/mpparse.c => x86/kernel/mpparse_64.c}   |    0 
 arch/{i386 => x86}/kernel/msr.c                    |    0 
 arch/{i386/kernel/nmi.c => x86/kernel/nmi_32.c}    |    0 
 arch/{x86_64/kernel/nmi.c => x86/kernel/nmi_64.c}  |    0 
 arch/{i386 => x86}/kernel/numaq.c                  |    0 
 arch/{i386 => x86}/kernel/paravirt.c               |    0 
 arch/{x86_64 => x86}/kernel/pci-calgary.c          |    0 
 .../kernel/pci-dma.c => x86/kernel/pci-dma_32.c}   |    0 
 .../kernel/pci-dma.c => x86/kernel/pci-dma_64.c}   |    0 
 arch/{x86_64 => x86}/kernel/pci-gart.c             |    0 
 arch/{x86_64 => x86}/kernel/pci-nommu.c            |    0 
 arch/{x86_64 => x86}/kernel/pci-swiotlb.c          |    0 
 arch/{i386 => x86}/kernel/pcspeaker.c              |    0 
 arch/{x86_64 => x86}/kernel/pmtimer.c              |    0 
 .../kernel/process.c => x86/kernel/process_32.c}   |    0 
 .../kernel/process.c => x86/kernel/process_64.c}   |    0 
 .../kernel/ptrace.c => x86/kernel/ptrace_32.c}     |    0 
 .../kernel/ptrace.c => x86/kernel/ptrace_64.c}     |    0 
 arch/{i386 => x86}/kernel/quirks.c                 |    0 
 .../kernel/reboot.c => x86/kernel/reboot_32.c}     |    0 
 .../kernel/reboot.c => x86/kernel/reboot_64.c}     |    0 
 arch/{i386 => x86}/kernel/reboot_fixups.c          |    0 
 .../kernel/relocate_kernel_32.S}                   |    0 
 .../kernel/relocate_kernel_64.S}                   |    0 
 arch/{i386 => x86}/kernel/scx200.c                 |    0 
 arch/{x86_64 => x86}/kernel/setup64.c              |    0 
 .../{i386/kernel/setup.c => x86/kernel/setup_32.c} |    0 
 .../kernel/setup.c => x86/kernel/setup_64.c}       |    0 
 arch/{i386 => x86}/kernel/sigframe.h               |    0 
 .../kernel/signal.c => x86/kernel/signal_32.c}     |    0 
 .../kernel/signal.c => x86/kernel/signal_64.c}     |    0 
 arch/{i386/kernel/smp.c => x86/kernel/smp_32.c}    |    0 
 arch/{x86_64/kernel/smp.c => x86/kernel/smp_64.c}  |    0 
 .../kernel/smpboot.c => x86/kernel/smpboot_32.c}   |    0 
 .../kernel/smpboot.c => x86/kernel/smpboot_64.c}   |    0 
 arch/{i386 => x86}/kernel/smpcommon.c              |    0 
 arch/{i386 => x86}/kernel/srat.c                   |    0 
 arch/{x86_64 => x86}/kernel/stacktrace.c           |    0 
 arch/{i386 => x86}/kernel/summit.c                 |    0 
 arch/{x86_64 => x86}/kernel/suspend.c              |    0 
 arch/{x86_64 => x86}/kernel/suspend_asm.S          |    0 
 arch/{i386 => x86}/kernel/sys_i386.c               |    0 
 arch/{x86_64 => x86}/kernel/sys_x86_64.c           |    0 
 arch/{x86_64 => x86}/kernel/syscall.c              |    4 +-
 arch/{i386 => x86}/kernel/syscall_table.S          |    0 
 arch/{i386 => x86}/kernel/sysenter.c               |    0 
 arch/{x86_64 => x86}/kernel/tce.c                  |    0 
 arch/{i386/kernel/time.c => x86/kernel/time_32.c}  |    0 
 .../{x86_64/kernel/time.c => x86/kernel/time_64.c} |    0 
 arch/{i386 => x86}/kernel/topology.c               |    0 
 .../trampoline.S => x86/kernel/trampoline_32.S}    |    0 
 .../trampoline.S => x86/kernel/trampoline_64.S}    |    0 
 .../{i386/kernel/traps.c => x86/kernel/traps_32.c} |    0 
 .../kernel/traps.c => x86/kernel/traps_64.c}       |    0 
 arch/{i386/kernel/tsc.c => x86/kernel/tsc_32.c}    |    0 
 arch/{x86_64/kernel/tsc.c => x86/kernel/tsc_64.c}  |    0 
 arch/{x86_64 => x86}/kernel/tsc_sync.c             |    0 
 arch/{x86_64 => x86}/kernel/verify_cpu.S           |    0 
 arch/{i386 => x86}/kernel/vm86.c                   |    0 
 arch/{i386 => x86}/kernel/vmi.c                    |    0 
 arch/{i386 => x86}/kernel/vmiclock.c               |    0 
 arch/x86/kernel/vmlinux.lds.S                      |    7 +
 .../vmlinux.lds.S => x86/kernel/vmlinux.lds_32.S}  |    0 
 .../vmlinux.lds.S => x86/kernel/vmlinux.lds_64.S}  |    0 
 arch/{x86_64 => x86}/kernel/vsmp.c                 |    0 
 arch/{i386 => x86}/kernel/vsyscall-int80.S         |    0 
 arch/{i386 => x86}/kernel/vsyscall-note.S          |    0 
 arch/{i386 => x86}/kernel/vsyscall-sigreturn.S     |    0 
 arch/{i386 => x86}/kernel/vsyscall-sysenter.S      |    0 
 arch/{i386 => x86}/kernel/vsyscall.lds.S           |    0 
 .../kernel/vsyscall.S => x86/kernel/vsyscall_32.S} |    4 +-
 .../kernel/vsyscall.c => x86/kernel/vsyscall_64.c} |    0 
 arch/{x86_64 => x86}/kernel/x8664_ksyms.c          |    0 
 arch/x86/lib/Makefile                              |    5 +
 arch/{i386/lib/Makefile => x86/lib/Makefile_32}    |    4 +-
 arch/x86/lib/Makefile_64                           |   13 +
 arch/{i386/lib/bitops.c => x86/lib/bitops_32.c}    |    0 
 arch/{x86_64/lib/bitops.c => x86/lib/bitops_64.c}  |    0 
 arch/{x86_64 => x86}/lib/bitstr.c                  |    0 
 arch/{i386 => x86}/lib/checksum.S                  |    0 
 arch/{x86_64 => x86}/lib/clear_page.S              |    0 
 arch/{x86_64 => x86}/lib/copy_page.S               |    0 
 arch/{x86_64 => x86}/lib/copy_user.S               |    0 
 arch/{x86_64 => x86}/lib/copy_user_nocache.S       |    0 
 arch/{x86_64 => x86}/lib/csum-copy.S               |    0 
 arch/{x86_64 => x86}/lib/csum-partial.c            |    0 
 arch/{x86_64 => x86}/lib/csum-wrappers.c           |    0 
 arch/{i386/lib/delay.c => x86/lib/delay_32.c}      |    0 
 arch/{x86_64/lib/delay.c => x86/lib/delay_64.c}    |    0 
 arch/{i386/lib/getuser.S => x86/lib/getuser_32.S}  |    0 
 .../{x86_64/lib/getuser.S => x86/lib/getuser_64.S} |    0 
 arch/{x86_64 => x86}/lib/io.c                      |    0 
 arch/{x86_64 => x86}/lib/iomap_copy.S              |    0 
 arch/{i386/lib/memcpy.c => x86/lib/memcpy_32.c}    |    0 
 arch/{x86_64/lib/memcpy.S => x86/lib/memcpy_64.S}  |    0 
 arch/{x86_64 => x86}/lib/memmove.c                 |    0 
 arch/{x86_64 => x86}/lib/memset.S                  |    0 
 arch/{i386 => x86}/lib/mmx.c                       |    0 
 arch/{i386 => x86}/lib/msr-on-cpu.c                |    0 
 arch/{i386/lib/putuser.S => x86/lib/putuser_32.S}  |    0 
 .../{x86_64/lib/putuser.S => x86/lib/putuser_64.S} |    0 
 arch/{x86_64 => x86}/lib/rwlock.S                  |    0 
 arch/{i386 => x86}/lib/semaphore.S                 |    0 
 arch/{i386 => x86}/lib/strstr.c                    |    0 
 arch/{x86_64 => x86}/lib/thunk.S                   |    0 
 .../{i386/lib/usercopy.c => x86/lib/usercopy_32.c} |    0 
 .../lib/usercopy.c => x86/lib/usercopy_64.c}       |    0 
 arch/{i386 => x86}/mach-default/Makefile           |    0 
 arch/{i386 => x86}/mach-default/setup.c            |    0 
 arch/{i386 => x86}/mach-es7000/Makefile            |    0 
 arch/{i386 => x86}/mach-es7000/es7000.h            |    0 
 arch/{i386 => x86}/mach-es7000/es7000plat.c        |    0 
 arch/{i386 => x86}/mach-generic/Makefile           |    0 
 arch/{i386 => x86}/mach-generic/bigsmp.c           |    0 
 arch/{i386 => x86}/mach-generic/default.c          |    0 
 arch/{i386 => x86}/mach-generic/es7000.c           |    0 
 arch/{i386 => x86}/mach-generic/probe.c            |    0 
 arch/{i386 => x86}/mach-generic/summit.c           |    0 
 arch/{i386 => x86}/mach-visws/Makefile             |    0 
 arch/{i386 => x86}/mach-visws/mpparse.c            |    0 
 arch/{i386 => x86}/mach-visws/reboot.c             |    0 
 arch/{i386 => x86}/mach-visws/setup.c              |    0 
 arch/{i386 => x86}/mach-visws/traps.c              |    0 
 arch/{i386 => x86}/mach-visws/visws_apic.c         |    0 
 arch/{i386 => x86}/mach-voyager/Makefile           |    0 
 arch/{i386 => x86}/mach-voyager/setup.c            |    0 
 arch/{i386 => x86}/mach-voyager/voyager_basic.c    |    0 
 arch/{i386 => x86}/mach-voyager/voyager_cat.c      |    0 
 arch/{i386 => x86}/mach-voyager/voyager_smp.c      |    0 
 arch/{i386 => x86}/mach-voyager/voyager_thread.c   |    0 
 arch/{i386 => x86}/math-emu/Makefile               |    0 
 arch/{i386 => x86}/math-emu/README                 |    0 
 arch/{i386 => x86}/math-emu/control_w.h            |    0 
 arch/{i386 => x86}/math-emu/div_Xsig.S             |    0 
 arch/{i386 => x86}/math-emu/div_small.S            |    0 
 arch/{i386 => x86}/math-emu/errors.c               |    0 
 arch/{i386 => x86}/math-emu/exception.h            |    0 
 arch/{i386 => x86}/math-emu/fpu_arith.c            |    0 
 arch/{i386 => x86}/math-emu/fpu_asm.h              |    0 
 arch/{i386 => x86}/math-emu/fpu_aux.c              |    0 
 arch/{i386 => x86}/math-emu/fpu_emu.h              |    0 
 arch/{i386 => x86}/math-emu/fpu_entry.c            |    0 
 arch/{i386 => x86}/math-emu/fpu_etc.c              |    0 
 arch/{i386 => x86}/math-emu/fpu_proto.h            |    0 
 arch/{i386 => x86}/math-emu/fpu_system.h           |    0 
 arch/{i386 => x86}/math-emu/fpu_tags.c             |    0 
 arch/{i386 => x86}/math-emu/fpu_trig.c             |    0 
 arch/{i386 => x86}/math-emu/get_address.c          |    0 
 arch/{i386 => x86}/math-emu/load_store.c           |    0 
 arch/{i386 => x86}/math-emu/mul_Xsig.S             |    0 
 arch/{i386 => x86}/math-emu/poly.h                 |    0 
 arch/{i386 => x86}/math-emu/poly_2xm1.c            |    0 
 arch/{i386 => x86}/math-emu/poly_atan.c            |    0 
 arch/{i386 => x86}/math-emu/poly_l2.c              |    0 
 arch/{i386 => x86}/math-emu/poly_sin.c             |    0 
 arch/{i386 => x86}/math-emu/poly_tan.c             |    0 
 arch/{i386 => x86}/math-emu/polynom_Xsig.S         |    0 
 arch/{i386 => x86}/math-emu/reg_add_sub.c          |    0 
 arch/{i386 => x86}/math-emu/reg_compare.c          |    0 
 arch/{i386 => x86}/math-emu/reg_constant.c         |    0 
 arch/{i386 => x86}/math-emu/reg_constant.h         |    0 
 arch/{i386 => x86}/math-emu/reg_convert.c          |    0 
 arch/{i386 => x86}/math-emu/reg_divide.c           |    0 
 arch/{i386 => x86}/math-emu/reg_ld_str.c           |    0 
 arch/{i386 => x86}/math-emu/reg_mul.c              |    0 
 arch/{i386 => x86}/math-emu/reg_norm.S             |    0 
 arch/{i386 => x86}/math-emu/reg_round.S            |    0 
 arch/{i386 => x86}/math-emu/reg_u_add.S            |    0 
 arch/{i386 => x86}/math-emu/reg_u_div.S            |    0 
 arch/{i386 => x86}/math-emu/reg_u_mul.S            |    0 
 arch/{i386 => x86}/math-emu/reg_u_sub.S            |    0 
 arch/{i386 => x86}/math-emu/round_Xsig.S           |    0 
 arch/{i386 => x86}/math-emu/shr_Xsig.S             |    0 
 arch/{i386 => x86}/math-emu/status_w.h             |    0 
 arch/{i386 => x86}/math-emu/version.h              |    0 
 arch/{i386 => x86}/math-emu/wm_shrx.S              |    0 
 arch/{i386 => x86}/math-emu/wm_sqrt.S              |    0 
 arch/x86/mm/Makefile                               |    5 +
 arch/{i386/mm/Makefile => x86/mm/Makefile_32}      |    2 +-
 arch/{x86_64/mm/Makefile => x86/mm/Makefile_64}    |    3 +-
 arch/{i386 => x86}/mm/boot_ioremap.c               |    0 
 arch/{i386 => x86}/mm/discontig.c                  |    0 
 arch/{i386/mm/extable.c => x86/mm/extable_32.c}    |    0 
 arch/{x86_64/mm/extable.c => x86/mm/extable_64.c}  |    0 
 arch/{i386/mm/fault.c => x86/mm/fault_32.c}        |    0 
 arch/{x86_64/mm/fault.c => x86/mm/fault_64.c}      |    0 
 arch/{i386 => x86}/mm/highmem.c                    |    0 
 arch/{i386 => x86}/mm/hugetlbpage.c                |    0 
 arch/{i386/mm/init.c => x86/mm/init_32.c}          |    0 
 arch/{x86_64/mm/init.c => x86/mm/init_64.c}        |    0 
 arch/{i386/mm/ioremap.c => x86/mm/ioremap_32.c}    |    0 
 arch/{x86_64/mm/ioremap.c => x86/mm/ioremap_64.c}  |    0 
 arch/{x86_64 => x86}/mm/k8topology.c               |    0 
 arch/{i386/mm/mmap.c => x86/mm/mmap_32.c}          |    0 
 arch/{x86_64/mm/mmap.c => x86/mm/mmap_64.c}        |    0 
 arch/{x86_64 => x86}/mm/numa.c                     |    0 
 arch/{i386/mm/pageattr.c => x86/mm/pageattr_32.c}  |    0 
 .../{x86_64/mm/pageattr.c => x86/mm/pageattr_64.c} |    0 
 arch/{i386 => x86}/mm/pgtable.c                    |    0 
 arch/{x86_64 => x86}/mm/srat.c                     |    0 
 arch/{i386 => x86}/oprofile/Kconfig                |    0 
 arch/x86/oprofile/Makefile                         |    5 +
 .../oprofile/Makefile => x86/oprofile/Makefile_32} |    0 
 .../oprofile/Makefile => x86/oprofile/Makefile_64} |    7 +-
 arch/{i386 => x86}/oprofile/backtrace.c            |    0 
 arch/{i386 => x86}/oprofile/init.c                 |    0 
 arch/{i386 => x86}/oprofile/nmi_int.c              |    0 
 arch/{i386 => x86}/oprofile/nmi_timer_int.c        |    0 
 arch/{i386 => x86}/oprofile/op_counter.h           |    0 
 arch/{i386 => x86}/oprofile/op_model_athlon.c      |    0 
 arch/{i386 => x86}/oprofile/op_model_p4.c          |    0 
 arch/{i386 => x86}/oprofile/op_model_ppro.c        |    0 
 arch/{i386 => x86}/oprofile/op_x86_model.h         |    0 
 arch/x86/pci/Makefile                              |    5 +
 arch/{i386/pci/Makefile => x86/pci/Makefile_32}    |    2 +-
 arch/x86/pci/Makefile_64                           |   17 +
 arch/{i386 => x86}/pci/acpi.c                      |    0 
 arch/{i386 => x86}/pci/common.c                    |    0 
 arch/{i386 => x86}/pci/direct.c                    |    0 
 arch/{i386 => x86}/pci/early.c                     |    0 
 arch/{i386 => x86}/pci/fixup.c                     |    0 
 arch/{i386 => x86}/pci/i386.c                      |    0 
 arch/{i386 => x86}/pci/init.c                      |    0 
 arch/{i386 => x86}/pci/irq.c                       |    0 
 arch/{x86_64 => x86}/pci/k8-bus.c                  |    0 
 arch/{i386 => x86}/pci/legacy.c                    |    0 
 arch/{i386 => x86}/pci/mmconfig-shared.c           |    0 
 .../{i386/pci/mmconfig.c => x86/pci/mmconfig_32.c} |    0 
 .../pci/mmconfig.c => x86/pci/mmconfig_64.c}       |    0 
 arch/{i386 => x86}/pci/numa.c                      |    0 
 arch/{i386 => x86}/pci/pcbios.c                    |    0 
 arch/{i386 => x86}/pci/pci.h                       |    0 
 arch/{i386 => x86}/pci/visws.c                     |    0 
 arch/{i386 => x86}/power/Makefile                  |    0 
 arch/{i386 => x86}/power/cpu.c                     |    0 
 arch/{i386 => x86}/power/suspend.c                 |    0 
 arch/{i386 => x86}/power/swsusp.S                  |    0 
 arch/{i386 => x86}/video/Makefile                  |    0 
 arch/{i386 => x86}/video/fbdev.c                   |    0 
 arch/{i386 => x86}/xen/Kconfig                     |    0 
 arch/{i386 => x86}/xen/Makefile                    |    0 
 arch/{i386 => x86}/xen/enlighten.c                 |    0 
 arch/{i386 => x86}/xen/events.c                    |    0 
 arch/{i386 => x86}/xen/features.c                  |    0 
 arch/{i386 => x86}/xen/manage.c                    |    0 
 arch/{i386 => x86}/xen/mmu.c                       |    0 
 arch/{i386 => x86}/xen/mmu.h                       |    0 
 arch/{i386 => x86}/xen/multicalls.c                |    0 
 arch/{i386 => x86}/xen/multicalls.h                |    0 
 arch/{i386 => x86}/xen/setup.c                     |    0 
 arch/{i386 => x86}/xen/smp.c                       |    0 
 arch/{i386 => x86}/xen/time.c                      |    0 
 arch/{i386 => x86}/xen/vdso.h                      |    0 
 arch/{i386 => x86}/xen/xen-asm.S                   |    0 
 arch/{i386 => x86}/xen/xen-head.S                  |    0 
 arch/{i386 => x86}/xen/xen-ops.h                   |    0 
 arch/x86_64/Kconfig                                |  788 +--------
 arch/x86_64/Makefile                               |  184 +--
 arch/x86_64/boot/.gitignore                        |    5 -
 arch/x86_64/boot/Makefile                          |    9 -
 arch/x86_64/boot/tools/.gitignore                  |    1 -
 arch/x86_64/kernel/Makefile                        |   65 -
 arch/x86_64/kernel/acpi/Makefile                   |    9 -
 arch/x86_64/lib/Makefile                           |   13 -
 arch/x86_64/lib/msr-on-cpu.c                       |    1 -
 arch/x86_64/oprofile/Kconfig                       |   17 -
 arch/x86_64/pci/Makefile                           |   27 -
 drivers/pci/hotplug/cpqphp_core.c                  |    2 +-
 drivers/pci/hotplug/cpqphp_pci.c                   |    2 +-
 drivers/pci/hotplug/ibmphp_core.c                  |    2 +-
 include/asm-i386/k8.h                              |    1 -
 include/asm-i386/mach-es7000/mach_apicdef.h        |   13 -
 include/asm-i386/mach-summit/irq_vectors_limits.h  |   14 -
 include/asm-i386/mach-summit/mach_apicdef.h        |   13 -
 include/asm-i386/mach-summit/mach_ipi.h            |   25 -
 include/asm-i386/pci-direct.h                      |    1 -
 include/asm-i386/stacktrace.h                      |    1 -
 .../{asm-i386/8253pit.h => asm-x86/8253pit_32.h}   |    0 
 .../{asm-x86_64/8253pit.h => asm-x86/8253pit_64.h} |    0 
 include/{asm-i386/Kbuild => asm-x86/Kbuild_32}     |    0 
 include/{asm-x86_64/Kbuild => asm-x86/Kbuild_64}   |    0 
 include/{asm-i386/a.out.h => asm-x86/a.out_32.h}   |    0 
 include/{asm-x86_64/a.out.h => asm-x86/a.out_64.h} |    0 
 include/{asm-i386/acpi.h => asm-x86/acpi_32.h}     |    0 
 include/{asm-x86_64/acpi.h => asm-x86/acpi_64.h}   |    0 
 include/{asm-i386/agp.h => asm-x86/agp_32.h}       |    0 
 include/{asm-x86_64/agp.h => asm-x86/agp_64.h}     |    0 
 .../alternative-asm_32.i}                          |    0 
 .../alternative-asm_64.i}                          |    0 
 .../alternative.h => asm-x86/alternative_32.h}     |    0 
 .../alternative.h => asm-x86/alternative_64.h}     |    0 
 include/{asm-i386/apic.h => asm-x86/apic_32.h}     |    0 
 include/{asm-x86_64/apic.h => asm-x86/apic_64.h}   |    0 
 .../{asm-i386/apicdef.h => asm-x86/apicdef_32.h}   |    0 
 .../{asm-x86_64/apicdef.h => asm-x86/apicdef_64.h} |    0 
 include/{asm-i386 => asm-x86}/arch_hooks.h         |    0 
 include/{asm-i386/atomic.h => asm-x86/atomic_32.h} |    0 
 .../{asm-x86_64/atomic.h => asm-x86/atomic_64.h}   |    0 
 include/{asm-i386/auxvec.h => asm-x86/auxvec_32.h} |    0 
 .../{asm-x86_64/auxvec.h => asm-x86/auxvec_64.h}   |    0 
 include/{asm-i386/bitops.h => asm-x86/bitops_32.h} |    0 
 .../{asm-x86_64/bitops.h => asm-x86/bitops_64.h}   |    0 
 include/{asm-i386 => asm-x86}/boot.h               |    0 
 include/{asm-i386 => asm-x86}/bootparam.h          |    0 
 include/{asm-x86_64 => asm-x86}/bootsetup.h        |    0 
 include/{asm-i386/bug.h => asm-x86/bug_32.h}       |    0 
 include/{asm-x86_64/bug.h => asm-x86/bug_64.h}     |    0 
 include/{asm-i386/bugs.h => asm-x86/bugs_32.h}     |    0 
 include/{asm-x86_64/bugs.h => asm-x86/bugs_64.h}   |    0 
 .../byteorder.h => asm-x86/byteorder_32.h}         |    0 
 .../byteorder.h => asm-x86/byteorder_64.h}         |    0 
 include/{asm-i386/cache.h => asm-x86/cache_32.h}   |    0 
 include/{asm-x86_64/cache.h => asm-x86/cache_64.h} |    0 
 .../cacheflush.h => asm-x86/cacheflush_32.h}       |    0 
 .../cacheflush.h => asm-x86/cacheflush_64.h}       |    0 
 include/{asm-x86_64 => asm-x86}/calgary.h          |    0 
 include/{asm-x86_64 => asm-x86}/calling.h          |    0 
 .../{asm-i386/checksum.h => asm-x86/checksum_32.h} |    0 
 .../checksum.h => asm-x86/checksum_64.h}           |    0 
 .../{asm-i386/cmpxchg.h => asm-x86/cmpxchg_32.h}   |    0 
 .../{asm-x86_64/cmpxchg.h => asm-x86/cmpxchg_64.h} |    0 
 include/{asm-x86_64 => asm-x86}/compat.h           |    0 
 include/{asm-i386 => asm-x86}/cpu.h                |    0 
 include/{asm-i386 => asm-x86}/cpufeature.h         |    0 
 .../{asm-i386/cputime.h => asm-x86/cputime_32.h}   |    0 
 .../{asm-x86_64/cputime.h => asm-x86/cputime_64.h} |    0 
 .../{asm-i386/current.h => asm-x86/current_32.h}   |    0 
 .../{asm-x86_64/current.h => asm-x86/current_64.h} |    0 
 .../{asm-i386/debugreg.h => asm-x86/debugreg_32.h} |    0 
 .../debugreg.h => asm-x86/debugreg_64.h}           |    0 
 include/{asm-i386/delay.h => asm-x86/delay_32.h}   |    0 
 include/{asm-x86_64/delay.h => asm-x86/delay_64.h} |    0 
 include/{asm-i386/desc.h => asm-x86/desc_32.h}     |    0 
 include/{asm-x86_64/desc.h => asm-x86/desc_64.h}   |    0 
 include/{asm-x86_64 => asm-x86}/desc_defs.h        |    0 
 include/{asm-i386/device.h => asm-x86/device_32.h} |    0 
 .../{asm-x86_64/device.h => asm-x86/device_64.h}   |    0 
 include/{asm-i386/div64.h => asm-x86/div64_32.h}   |    0 
 include/{asm-x86_64/div64.h => asm-x86/div64_64.h} |    0 
 .../dma-mapping.h => asm-x86/dma-mapping_32.h}     |    0 
 .../dma-mapping.h => asm-x86/dma-mapping_64.h}     |    0 
 include/{asm-i386/dma.h => asm-x86/dma_32.h}       |    0 
 include/{asm-x86_64/dma.h => asm-x86/dma_64.h}     |    0 
 include/{asm-i386/dmi.h => asm-x86/dmi_32.h}       |    0 
 include/{asm-x86_64/dmi.h => asm-x86/dmi_64.h}     |    0 
 include/{asm-i386/dwarf2.h => asm-x86/dwarf2_32.h} |    0 
 .../{asm-x86_64/dwarf2.h => asm-x86/dwarf2_64.h}   |    0 
 include/{asm-i386/e820.h => asm-x86/e820_32.h}     |    0 
 include/{asm-x86_64/e820.h => asm-x86/e820_64.h}   |    0 
 include/{asm-i386/edac.h => asm-x86/edac_32.h}     |    0 
 include/{asm-x86_64/edac.h => asm-x86/edac_64.h}   |    0 
 include/{asm-i386/elf.h => asm-x86/elf_32.h}       |    0 
 include/{asm-x86_64/elf.h => asm-x86/elf_64.h}     |    0 
 include/{asm-i386 => asm-x86}/emergency-restart.h  |    0 
 include/{asm-i386/errno.h => asm-x86/errno_32.h}   |    0 
 include/{asm-x86_64/errno.h => asm-x86/errno_64.h} |    0 
 include/{asm-i386/fb.h => asm-x86/fb_32.h}         |    0 
 include/{asm-x86_64/fb.h => asm-x86/fb_64.h}       |    0 
 include/{asm-i386 => asm-x86}/fcntl.h              |    0 
 include/{asm-i386/fixmap.h => asm-x86/fixmap_32.h} |    0 
 .../{asm-x86_64/fixmap.h => asm-x86/fixmap_64.h}   |    0 
 include/{asm-i386/floppy.h => asm-x86/floppy_32.h} |    0 
 .../{asm-x86_64/floppy.h => asm-x86/floppy_64.h}   |    0 
 include/{asm-x86_64 => asm-x86}/fpu32.h            |    0 
 include/{asm-i386 => asm-x86}/frame.i              |    0 
 include/{asm-i386/futex.h => asm-x86/futex_32.h}   |    0 
 include/{asm-x86_64/futex.h => asm-x86/futex_64.h} |    0 
 .../{asm-i386/genapic.h => asm-x86/genapic_32.h}   |    0 
 .../{asm-x86_64/genapic.h => asm-x86/genapic_64.h} |    0 
 .../{asm-i386/hardirq.h => asm-x86/hardirq_32.h}   |    0 
 .../{asm-x86_64/hardirq.h => asm-x86/hardirq_64.h} |    0 
 include/{asm-i386 => asm-x86}/highmem.h            |    0 
 include/{asm-i386/hpet.h => asm-x86/hpet_32.h}     |    0 
 include/{asm-x86_64/hpet.h => asm-x86/hpet_64.h}   |    0 
 include/{asm-i386/hw_irq.h => asm-x86/hw_irq_32.h} |    0 
 .../{asm-x86_64/hw_irq.h => asm-x86/hw_irq_64.h}   |    0 
 include/{asm-i386 => asm-x86}/hypertransport.h     |    0 
 include/{asm-i386/i387.h => asm-x86/i387_32.h}     |    0 
 include/{asm-x86_64/i387.h => asm-x86/i387_64.h}   |    0 
 include/{asm-i386 => asm-x86}/i8253.h              |    0 
 include/{asm-i386 => asm-x86}/i8259.h              |    0 
 include/{asm-x86_64 => asm-x86}/ia32.h             |    0 
 include/{asm-x86_64 => asm-x86}/ia32_unistd.h      |    0 
 include/{asm-i386 => asm-x86}/ide.h                |    0 
 include/{asm-x86_64 => asm-x86}/idle.h             |    0 
 .../intel_arch_perfmon_32.h}                       |    0 
 .../intel_arch_perfmon_64.h}                       |    0 
 include/{asm-i386/io.h => asm-x86/io_32.h}         |    0 
 include/{asm-x86_64/io.h => asm-x86/io_64.h}       |    0 
 .../{asm-i386/io_apic.h => asm-x86/io_apic_32.h}   |    0 
 .../{asm-x86_64/io_apic.h => asm-x86/io_apic_64.h} |    0 
 include/{asm-i386 => asm-x86}/ioctl.h              |    0 
 include/{asm-i386/ioctls.h => asm-x86/ioctls_32.h} |    0 
 .../{asm-x86_64/ioctls.h => asm-x86/ioctls_64.h}   |    0 
 include/{asm-i386 => asm-x86}/ipc.h                |    0 
 include/{asm-i386/ipcbuf.h => asm-x86/ipcbuf_32.h} |    0 
 .../{asm-x86_64/ipcbuf.h => asm-x86/ipcbuf_64.h}   |    0 
 include/{asm-x86_64 => asm-x86}/ipi.h              |    0 
 include/{asm-i386/irq.h => asm-x86/irq_32.h}       |    0 
 include/{asm-x86_64/irq.h => asm-x86/irq_64.h}     |    0 
 .../{asm-i386/irq_regs.h => asm-x86/irq_regs_32.h} |    0 
 .../irq_regs.h => asm-x86/irq_regs_64.h}           |    0 
 .../{asm-i386/irqflags.h => asm-x86/irqflags_32.h} |    0 
 .../irqflags.h => asm-x86/irqflags_64.h}           |    0 
 include/{asm-i386 => asm-x86}/ist.h                |    0 
 include/{asm-x86_64 => asm-x86}/k8.h               |    0 
 include/{asm-i386/kdebug.h => asm-x86/kdebug_32.h} |    0 
 .../{asm-x86_64/kdebug.h => asm-x86/kdebug_64.h}   |    0 
 include/{asm-i386/kexec.h => asm-x86/kexec_32.h}   |    0 
 include/{asm-x86_64/kexec.h => asm-x86/kexec_64.h} |    0 
 .../kmap_types.h => asm-x86/kmap_types_32.h}       |    0 
 .../kmap_types.h => asm-x86/kmap_types_64.h}       |    0 
 .../{asm-i386/kprobes.h => asm-x86/kprobes_32.h}   |    0 
 .../{asm-x86_64/kprobes.h => asm-x86/kprobes_64.h} |    0 
 include/{asm-i386/ldt.h => asm-x86/ldt_32.h}       |    0 
 include/{asm-x86_64/ldt.h => asm-x86/ldt_64.h}     |    0 
 .../{asm-i386/linkage.h => asm-x86/linkage_32.h}   |    0 
 .../{asm-x86_64/linkage.h => asm-x86/linkage_64.h} |    0 
 include/{asm-i386/local.h => asm-x86/local_32.h}   |    0 
 include/{asm-x86_64/local.h => asm-x86/local_64.h} |    0 
 .../{asm-i386 => asm-x86}/mach-bigsmp/mach_apic.h  |    0 
 .../mach-bigsmp/mach_apicdef.h                     |    0 
 .../{asm-i386 => asm-x86}/mach-bigsmp/mach_ipi.h   |    0 
 .../mach-bigsmp/mach_mpspec.h                      |    0 
 include/{asm-i386 => asm-x86}/mach-default/apm.h   |    0 
 .../{asm-i386 => asm-x86}/mach-default/bios_ebda.h |    0 
 .../{asm-i386 => asm-x86}/mach-default/do_timer.h  |    0 
 .../mach-default/entry_arch.h                      |    0 
 .../{asm-i386 => asm-x86}/mach-default/io_ports.h  |    0 
 .../mach-default/irq_vectors.h                     |    0 
 .../mach-default/irq_vectors_limits.h              |    0 
 .../{asm-i386 => asm-x86}/mach-default/mach_apic.h |    0 
 .../mach-default/mach_apicdef.h                    |    0 
 .../{asm-i386 => asm-x86}/mach-default/mach_ipi.h  |    0 
 .../mach-default/mach_mpparse.h                    |    0 
 .../mach-default/mach_mpspec.h                     |    0 
 .../mach-default/mach_reboot.h                     |    0 
 .../{asm-i386 => asm-x86}/mach-default/mach_time.h |    0 
 .../mach-default/mach_timer.h                      |    0 
 .../mach-default/mach_traps.h                      |    0 
 .../mach-default/mach_wakecpu.h                    |    0 
 .../mach-default/pci-functions.h                   |    0 
 .../mach-default/setup_arch.h                      |    0 
 .../mach-default/smpboot_hooks.h                   |    0 
 .../{asm-i386 => asm-x86}/mach-es7000/mach_apic.h  |    0 
 .../mach-es7000}/mach_apicdef.h                    |    0 
 .../{asm-i386 => asm-x86}/mach-es7000/mach_ipi.h   |    0 
 .../mach-es7000/mach_mpparse.h                     |    0 
 .../mach-es7000/mach_mpspec.h                      |    0 
 .../mach-es7000/mach_wakecpu.h                     |    0 
 .../mach-generic/irq_vectors_limits.h              |    0 
 .../{asm-i386 => asm-x86}/mach-generic/mach_apic.h |    0 
 .../mach-generic/mach_apicdef.h                    |    0 
 .../{asm-i386 => asm-x86}/mach-generic/mach_ipi.h  |    0 
 .../mach-generic/mach_mpparse.h                    |    0 
 .../mach-generic/mach_mpspec.h                     |    0 
 .../{asm-i386 => asm-x86}/mach-numaq/mach_apic.h   |    0 
 .../mach-numaq/mach_apicdef.h                      |    0 
 .../{asm-i386 => asm-x86}/mach-numaq/mach_ipi.h    |    0 
 .../mach-numaq/mach_mpparse.h                      |    0 
 .../{asm-i386 => asm-x86}/mach-numaq/mach_mpspec.h |    0 
 .../mach-numaq/mach_wakecpu.h                      |    0 
 .../mach-summit}/irq_vectors_limits.h              |    0 
 .../{asm-i386 => asm-x86}/mach-summit/mach_apic.h  |    0 
 .../mach-summit}/mach_apicdef.h                    |    0 
 .../mach-bigsmp => asm-x86/mach-summit}/mach_ipi.h |    0 
 .../mach-summit/mach_mpparse.h                     |    0 
 .../mach-summit/mach_mpspec.h                      |    0 
 include/{asm-i386 => asm-x86}/mach-visws/cobalt.h  |    0 
 .../{asm-i386 => asm-x86}/mach-visws/entry_arch.h  |    0 
 .../{asm-i386 => asm-x86}/mach-visws/irq_vectors.h |    0 
 include/{asm-i386 => asm-x86}/mach-visws/lithium.h |    0 
 .../{asm-i386 => asm-x86}/mach-visws/mach_apic.h   |    0 
 .../mach-visws/mach_apicdef.h                      |    0 
 include/{asm-i386 => asm-x86}/mach-visws/piix4.h   |    0 
 .../{asm-i386 => asm-x86}/mach-visws/setup_arch.h  |    0 
 .../mach-visws/smpboot_hooks.h                     |    0 
 .../{asm-i386 => asm-x86}/mach-voyager/do_timer.h  |    0 
 .../mach-voyager/entry_arch.h                      |    0 
 .../mach-voyager/irq_vectors.h                     |    0 
 .../mach-voyager/setup_arch.h                      |    0 
 include/{asm-x86_64 => asm-x86}/mach_apic.h        |    0 
 include/{asm-i386 => asm-x86}/math_emu.h           |    0 
 .../mc146818rtc.h => asm-x86/mc146818rtc_32.h}     |    0 
 .../mc146818rtc.h => asm-x86/mc146818rtc_64.h}     |    0 
 include/{asm-i386 => asm-x86}/mca.h                |    0 
 include/{asm-i386 => asm-x86}/mca_dma.h            |    0 
 include/{asm-i386/mce.h => asm-x86/mce_32.h}       |    0 
 include/{asm-x86_64/mce.h => asm-x86/mce_64.h}     |    0 
 include/{asm-i386/mman.h => asm-x86/mman_32.h}     |    0 
 include/{asm-x86_64/mman.h => asm-x86/mman_64.h}   |    0 
 include/{asm-x86_64 => asm-x86}/mmsegment.h        |    0 
 include/{asm-i386/mmu.h => asm-x86/mmu_32.h}       |    0 
 include/{asm-x86_64/mmu.h => asm-x86/mmu_64.h}     |    0 
 .../mmu_context.h => asm-x86/mmu_context_32.h}     |    0 
 .../mmu_context.h => asm-x86/mmu_context_64.h}     |    0 
 include/{asm-i386 => asm-x86}/mmx.h                |    0 
 include/{asm-i386/mmzone.h => asm-x86/mmzone_32.h} |    0 
 .../{asm-x86_64/mmzone.h => asm-x86/mmzone_64.h}   |    0 
 include/{asm-i386/module.h => asm-x86/module_32.h} |    0 
 .../{asm-x86_64/module.h => asm-x86/module_64.h}   |    0 
 include/{asm-i386/mpspec.h => asm-x86/mpspec_32.h} |    0 
 .../{asm-x86_64/mpspec.h => asm-x86/mpspec_64.h}   |    0 
 include/{asm-i386 => asm-x86}/mpspec_def.h         |    0 
 include/{asm-i386/msgbuf.h => asm-x86/msgbuf_32.h} |    0 
 .../{asm-x86_64/msgbuf.h => asm-x86/msgbuf_64.h}   |    0 
 include/{asm-i386 => asm-x86}/msidef.h             |    0 
 include/{asm-i386 => asm-x86}/msr-index.h          |    0 
 include/{asm-i386/msr.h => asm-x86/msr_32.h}       |    0 
 include/{asm-x86_64/msr.h => asm-x86/msr_64.h}     |    0 
 include/{asm-i386/mtrr.h => asm-x86/mtrr_32.h}     |    0 
 include/{asm-x86_64/mtrr.h => asm-x86/mtrr_64.h}   |    0 
 include/{asm-i386/mutex.h => asm-x86/mutex_32.h}   |    0 
 include/{asm-x86_64/mutex.h => asm-x86/mutex_64.h} |    0 
 include/{asm-i386/namei.h => asm-x86/namei_32.h}   |    0 
 include/{asm-x86_64/namei.h => asm-x86/namei_64.h} |    0 
 include/{asm-i386/nmi.h => asm-x86/nmi_32.h}       |    0 
 include/{asm-x86_64/nmi.h => asm-x86/nmi_64.h}     |    0 
 include/{asm-x86_64 => asm-x86}/node.h             |    0 
 include/{asm-i386/numa.h => asm-x86/numa_32.h}     |    0 
 include/{asm-x86_64/numa.h => asm-x86/numa_64.h}   |    0 
 include/{asm-i386 => asm-x86}/numaq.h              |    0 
 include/{asm-i386/page.h => asm-x86/page_32.h}     |    0 
 include/{asm-x86_64/page.h => asm-x86/page_64.h}   |    0 
 include/{asm-i386/param.h => asm-x86/param_32.h}   |    0 
 include/{asm-x86_64/param.h => asm-x86/param_64.h} |    0 
 include/{asm-i386 => asm-x86}/paravirt.h           |    0 
 .../{asm-i386/parport.h => asm-x86/parport_32.h}   |    0 
 .../{asm-x86_64/parport.h => asm-x86/parport_64.h} |    0 
 include/{asm-x86_64 => asm-x86}/pci-direct.h       |    0 
 include/{asm-i386/pci.h => asm-x86/pci_32.h}       |    0 
 include/{asm-x86_64/pci.h => asm-x86/pci_64.h}     |    0 
 include/{asm-x86_64 => asm-x86}/pda.h              |    0 
 include/{asm-i386/percpu.h => asm-x86/percpu_32.h} |    0 
 .../{asm-x86_64/percpu.h => asm-x86/percpu_64.h}   |    0 
 .../{asm-i386/pgalloc.h => asm-x86/pgalloc_32.h}   |    0 
 .../{asm-x86_64/pgalloc.h => asm-x86/pgalloc_64.h} |    0 
 .../{asm-i386 => asm-x86}/pgtable-2level-defs.h    |    0 
 include/{asm-i386 => asm-x86}/pgtable-2level.h     |    0 
 .../{asm-i386 => asm-x86}/pgtable-3level-defs.h    |    0 
 include/{asm-i386 => asm-x86}/pgtable-3level.h     |    0 
 .../{asm-i386/pgtable.h => asm-x86/pgtable_32.h}   |    0 
 .../{asm-x86_64/pgtable.h => asm-x86/pgtable_64.h} |    0 
 include/{asm-i386 => asm-x86}/poll.h               |    0 
 .../posix_types.h => asm-x86/posix_types_32.h}     |    0 
 .../posix_types.h => asm-x86/posix_types_64.h}     |    0 
 include/{asm-x86_64 => asm-x86}/prctl.h            |    0 
 include/{asm-i386 => asm-x86}/processor-flags.h    |    0 
 .../processor.h => asm-x86/processor_32.h}         |    0 
 .../processor.h => asm-x86/processor_64.h}         |    0 
 include/{asm-x86_64 => asm-x86}/proto.h            |    0 
 .../ptrace-abi.h => asm-x86/ptrace-abi_32.h}       |    0 
 .../ptrace-abi.h => asm-x86/ptrace-abi_64.h}       |    0 
 include/{asm-i386/ptrace.h => asm-x86/ptrace_32.h} |    0 
 .../{asm-x86_64/ptrace.h => asm-x86/ptrace_64.h}   |    0 
 include/{asm-i386 => asm-x86}/reboot.h             |    0 
 include/{asm-i386 => asm-x86}/reboot_fixups.h      |    0 
 .../required-features_32.h}                        |    0 
 .../required-features_64.h}                        |    0 
 .../{asm-i386/resource.h => asm-x86/resource_32.h} |    0 
 .../resource.h => asm-x86/resource_64.h}           |    0 
 include/{asm-x86_64 => asm-x86}/rio.h              |    0 
 include/{asm-i386/rtc.h => asm-x86/rtc_32.h}       |    0 
 include/{asm-x86_64/rtc.h => asm-x86/rtc_64.h}     |    0 
 include/{asm-i386/rwlock.h => asm-x86/rwlock_32.h} |    0 
 .../{asm-x86_64/rwlock.h => asm-x86/rwlock_64.h}   |    0 
 include/{asm-i386 => asm-x86}/rwsem.h              |    0 
 .../scatterlist.h => asm-x86/scatterlist_32.h}     |    0 
 .../scatterlist.h => asm-x86/scatterlist_64.h}     |    0 
 .../{asm-i386/seccomp.h => asm-x86/seccomp_32.h}   |    0 
 .../{asm-x86_64/seccomp.h => asm-x86/seccomp_64.h} |    0 
 .../{asm-i386/sections.h => asm-x86/sections_32.h} |    0 
 .../sections.h => asm-x86/sections_64.h}           |    0 
 .../{asm-i386/segment.h => asm-x86/segment_32.h}   |    0 
 .../{asm-x86_64/segment.h => asm-x86/segment_64.h} |    0 
 .../semaphore.h => asm-x86/semaphore_32.h}         |    0 
 .../semaphore.h => asm-x86/semaphore_64.h}         |    0 
 include/{asm-i386/sembuf.h => asm-x86/sembuf_32.h} |    0 
 .../{asm-x86_64/sembuf.h => asm-x86/sembuf_64.h}   |    0 
 include/{asm-i386/serial.h => asm-x86/serial_32.h} |    0 
 .../{asm-x86_64/serial.h => asm-x86/serial_64.h}   |    0 
 include/{asm-i386/setup.h => asm-x86/setup_32.h}   |    0 
 include/{asm-x86_64/setup.h => asm-x86/setup_64.h} |    0 
 include/{asm-i386/shmbuf.h => asm-x86/shmbuf_32.h} |    0 
 .../{asm-x86_64/shmbuf.h => asm-x86/shmbuf_64.h}   |    0 
 .../{asm-i386/shmparam.h => asm-x86/shmparam_32.h} |    0 
 .../shmparam.h => asm-x86/shmparam_64.h}           |    0 
 include/{asm-x86_64 => asm-x86}/sigcontext32.h     |    0 
 .../sigcontext.h => asm-x86/sigcontext_32.h}       |    0 
 .../sigcontext.h => asm-x86/sigcontext_64.h}       |    0 
 .../{asm-i386/siginfo.h => asm-x86/siginfo_32.h}   |    0 
 .../{asm-x86_64/siginfo.h => asm-x86/siginfo_64.h} |    0 
 include/{asm-i386/signal.h => asm-x86/signal_32.h} |    0 
 .../{asm-x86_64/signal.h => asm-x86/signal_64.h}   |    0 
 include/{asm-i386/smp.h => asm-x86/smp_32.h}       |    0 
 include/{asm-x86_64/smp.h => asm-x86/smp_64.h}     |    0 
 include/{asm-i386/socket.h => asm-x86/socket_32.h} |    0 
 .../{asm-x86_64/socket.h => asm-x86/socket_64.h}   |    0 
 .../{asm-i386/sockios.h => asm-x86/sockios_32.h}   |    0 
 .../{asm-x86_64/sockios.h => asm-x86/sockios_64.h} |    0 
 .../sparsemem.h => asm-x86/sparsemem_32.h}         |    0 
 .../sparsemem.h => asm-x86/sparsemem_64.h}         |    0 
 .../{asm-i386/spinlock.h => asm-x86/spinlock_32.h} |    0 
 .../spinlock.h => asm-x86/spinlock_64.h}           |    0 
 include/{asm-i386 => asm-x86}/spinlock_types.h     |    0 
 include/{asm-i386 => asm-x86}/srat.h               |    0 
 include/{asm-x86_64 => asm-x86}/stacktrace.h       |    0 
 include/{asm-i386/stat.h => asm-x86/stat_32.h}     |    0 
 include/{asm-x86_64/stat.h => asm-x86/stat_64.h}   |    0 
 include/{asm-i386/statfs.h => asm-x86/statfs_32.h} |    0 
 .../{asm-x86_64/statfs.h => asm-x86/statfs_64.h}   |    0 
 include/{asm-i386/string.h => asm-x86/string_32.h} |    0 
 .../{asm-x86_64/string.h => asm-x86/string_64.h}   |    0 
 .../{asm-i386/suspend.h => asm-x86/suspend_32.h}   |    0 
 .../{asm-x86_64/suspend.h => asm-x86/suspend_64.h} |    0 
 include/{asm-x86_64 => asm-x86}/swiotlb.h          |    0 
 include/{asm-i386 => asm-x86}/sync_bitops.h        |    0 
 include/{asm-i386/system.h => asm-x86/system_32.h} |    0 
 .../{asm-x86_64/system.h => asm-x86/system_64.h}   |    0 
 include/{asm-x86_64 => asm-x86}/tce.h              |    0 
 .../{asm-i386/termbits.h => asm-x86/termbits_32.h} |    0 
 .../termbits.h => asm-x86/termbits_64.h}           |    0 
 .../{asm-i386/termios.h => asm-x86/termios_32.h}   |    0 
 .../{asm-x86_64/termios.h => asm-x86/termios_64.h} |    0 
 include/{asm-i386 => asm-x86}/therm_throt.h        |    0 
 .../thread_info.h => asm-x86/thread_info_32.h}     |    0 
 .../thread_info.h => asm-x86/thread_info_64.h}     |    0 
 include/{asm-i386 => asm-x86}/time.h               |    0 
 include/{asm-i386 => asm-x86}/timer.h              |    0 
 include/{asm-i386/timex.h => asm-x86/timex_32.h}   |    0 
 include/{asm-x86_64/timex.h => asm-x86/timex_64.h} |    0 
 include/{asm-i386/tlb.h => asm-x86/tlb_32.h}       |    0 
 include/{asm-x86_64/tlb.h => asm-x86/tlb_64.h}     |    0 
 .../{asm-i386/tlbflush.h => asm-x86/tlbflush_32.h} |    0 
 .../tlbflush.h => asm-x86/tlbflush_64.h}           |    0 
 .../{asm-i386/topology.h => asm-x86/topology_32.h} |    0 
 .../topology.h => asm-x86/topology_64.h}           |    0 
 include/{asm-i386 => asm-x86}/tsc.h                |    0 
 include/{asm-i386/types.h => asm-x86/types_32.h}   |    0 
 include/{asm-x86_64/types.h => asm-x86/types_64.h} |    0 
 .../{asm-i386/uaccess.h => asm-x86/uaccess_32.h}   |    0 
 .../{asm-x86_64/uaccess.h => asm-x86/uaccess_64.h} |    0 
 .../{asm-i386/ucontext.h => asm-x86/ucontext_32.h} |    0 
 .../ucontext.h => asm-x86/ucontext_64.h}           |    0 
 .../unaligned.h => asm-x86/unaligned_32.h}         |    0 
 .../unaligned.h => asm-x86/unaligned_64.h}         |    0 
 include/{asm-i386/unistd.h => asm-x86/unistd_32.h} |    0 
 .../{asm-x86_64/unistd.h => asm-x86/unistd_64.h}   |    0 
 include/{asm-i386/unwind.h => asm-x86/unwind_32.h} |    0 
 .../{asm-x86_64/unwind.h => asm-x86/unwind_64.h}   |    0 
 include/{asm-x86_64 => asm-x86}/user32.h           |    0 
 include/{asm-i386/user.h => asm-x86/user_32.h}     |    0 
 include/{asm-x86_64/user.h => asm-x86/user_64.h}   |    0 
 include/{asm-i386 => asm-x86}/vga.h                |    0 
 include/{asm-i386 => asm-x86}/vic.h                |    0 
 include/{asm-i386 => asm-x86}/vm86.h               |    0 
 include/{asm-i386 => asm-x86}/vmi.h                |    0 
 include/{asm-i386 => asm-x86}/vmi_time.h           |    0 
 include/{asm-i386 => asm-x86}/voyager.h            |    0 
 include/{asm-x86_64 => asm-x86}/vsyscall.h         |    0 
 include/{asm-x86_64 => asm-x86}/vsyscall32.h       |    0 
 include/{asm-i386 => asm-x86}/xen/hypercall.h      |    0 
 include/{asm-i386 => asm-x86}/xen/hypervisor.h     |    0 
 include/{asm-i386 => asm-x86}/xen/interface.h      |    0 
 include/{asm-i386/xor.h => asm-x86/xor_32.h}       |    0 
 include/{asm-x86_64/xor.h => asm-x86/xor_64.h}     |    0 
 include/asm-x86_64/boot.h                          |    1 -
 include/asm-x86_64/bootparam.h                     |    1 -
 include/asm-x86_64/cpu.h                           |    1 -
 include/asm-x86_64/cpufeature.h                    |   30 -
 include/asm-x86_64/emergency-restart.h             |    6 -
 include/asm-x86_64/fcntl.h                         |    1 -
 include/asm-x86_64/hypertransport.h                |   42 -
 include/asm-x86_64/ide.h                           |    1 -
 include/asm-x86_64/ioctl.h                         |    1 -
 include/asm-x86_64/msidef.h                        |   47 -
 include/asm-x86_64/msr-index.h                     |    1 -
 include/asm-x86_64/poll.h                          |    1 -
 include/asm-x86_64/processor-flags.h               |    1 -
 include/asm-x86_64/spinlock_types.h                |   20 -
 include/asm-x86_64/therm_throt.h                   |    1 -
 include/asm-x86_64/tsc.h                           |    1 -
 include/asm-x86_64/vga.h                           |   20 -
 scripts/checksyscalls.sh                           |    2 +-
 918 files changed, 4745 insertions(+), 2836 deletions(-)
#43 lore raw
Quoted 10 lines · Chris Wright
Quoted 5 lines · * Matt Mackall ([email protected]) wrote:

Can we see some stats on:

How many files were auto-merged?
How many files got 32.c and 64.c extensions?
How many existed only in one arch?

It's mostly about file movement first.

 918 files changed, 4745 insertions(+), 2836 deletions(-)

Hmm, did you forget to make distclean ?

Numbers from the script:

include/asm-i386 240 files
include/asm-x86_64 169 files
------------------------------

                     409 files

include/asm-x86 389 files

arch/i386 335 files
arch/x86_64 141 files
------------------------------

                     476 files

arch/x86 484 files

The increase here is due to migration helper files which only include the (_32.x or the _64.x) variant.

Makefile helpers       9 files
Kconfig helpers        1 file
Source helpers         4 files

------------------------------
14 files

Summary:
vanilla 22657 files
vanilla->x86 22649 files

------------------------------

include/x86 has 125 _32 and 125 _64 files
arch/x86 has 55 _32 and 55 _64 files

25 files were auto-merged

Looking at include/asm-x86/*_[32/64].h there are offhand ~ 50 of the 125 which differ only minimal (white space damage, comment changes, ...), where the unification is a no brainer.

tglx

#44 lore raw
Quoted 45 lines · Thomas Gleixner
Quoted 10 lines · Chris Wright
Quoted 5 lines · * Matt Mackall ([email protected]) wrote:

Can we see some stats on:

How many files were auto-merged?
How many files got 32.c and 64.c extensions?
How many existed only in one arch?

It's mostly about file movement first.

 918 files changed, 4745 insertions(+), 2836 deletions(-)

Hmm, did you forget to make distclean ?

Numbers from the script:

include/asm-i386 240 files
include/asm-x86_64 169 files
------------------------------

                     409 files

include/asm-x86 389 files

arch/i386 335 files
arch/x86_64 141 files
------------------------------

                     476 files

arch/x86 484 files

The increase here is due to migration helper files which only include the (_32.x or the _64.x) variant.

Makefile helpers       9 files
Kconfig helpers        1 file
Source helpers         4 files

------------------------------
14 files

Summary:
vanilla 22657 files
vanilla->x86 22649 files

------------------------------

Quoted 8 lines

include/x86 has 125 _32 and 125 _64 files
arch/x86 has 55 _32 and 55 _64 files

25 files were auto-merged

Looking at include/asm-x86/*_[32/64].h there are offhand ~ 50 of the 125 which differ only minimal (white space damage, comment changes, ...), where the unification is a no brainer.

That looks more promising than I would have expected. For what it's worth, I was originally fairly disgusted by the _32/64.c thing, but the idea grows on me.

Signature · 1 line
Mathematics is the supreme nostalgia of our time.