Re: [PATCH] x86: x86_{phys,virt}_bits field also for i386 (v2)

[Ingo Molnar]

* Jan Beulich <jbeulich@xxxxxxxxxx> wrote:

> >>> Ingo Molnar <mingo@xxxxxxx> 05.09.08 17:00 >>>
> >
> >* Jan Beulich <jbeulich@xxxxxxxxxx> wrote:
> >
> >> Make the x86_{phys,virt}_bits common for 32- and 64-bits, and use the
> >> former in ioremap's phys_addr_valid() check also on 32bit/PAE.
> >> 
> >> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
> >> 
> >> ---
> >>  arch/x86/kernel/cpu/common.c |   17 +++++++++++++++++
> >>  arch/x86/mm/ioremap.c        |   15 ++++++---------
> >>  include/asm-x86/processor.h  |    4 ++--
> >>  3 files changed, 25 insertions(+), 11 deletions(-)
> >
> >hm, the cpu/common.c bits just got reworked massively in tip/master. 
> >I've tried a blind merge (see the patch below) but at least the first 
> >hunk looks wrong. Mind looking at how to merge this?
> 
> This is my take at it:
> 
> Make the x86_{phys,virt}_bits common for 32- and 64-bits, and use the
> former in ioremap's phys_addr_valid() check also on 32bit/PAE.

applied to tip/x86/mm-debug - thanks Jan!

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/