diff options
| author | Dave Hansen <haveblue@us.ibm.com> | 2006-03-27 01:16:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:44:48 -0800 |
| commit | 22a9835c350782a5c3257343713932af3ac92ee0 (patch) | |
| tree | 9688e99426e8aa85a468cc724ffee32c6a8abcad /arch/um/kernel/physmem.c | |
| parent | 95144c788dc01b6a0ff2c9c2222e37ffdab358b8 (diff) | |
| download | linux-22a9835c350782a5c3257343713932af3ac92ee0.tar.gz linux-22a9835c350782a5c3257343713932af3ac92ee0.tar.bz2 linux-22a9835c350782a5c3257343713932af3ac92ee0.zip | |
[PATCH] unify PFN_* macros
Just about every architecture defines some macros to do operations on pfns.
They're all virtually identical. This patch consolidates all of them.
One minor glitch is that at least i386 uses them in a very skeletal header
file. To keep away from #include dependency hell, I stuck the new
definitions in a new, isolated header.
Of all of the implementations, sh64 is the only one that varied by a bit.
It used some masks to ensure that any sign-extension got ripped away before
the arithmetic is done. This has been posted to that sh64 maintainers and
the development list.
Compiles on x86, x86_64, ia64 and ppc64.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/physmem.c')
| -rw-r--r-- | arch/um/kernel/physmem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 0e65340eee33..0500800df1c1 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c @@ -9,6 +9,7 @@ #include "linux/vmalloc.h" #include "linux/bootmem.h" #include "linux/module.h" +#include "linux/pfn.h" #include "asm/types.h" #include "asm/pgtable.h" #include "kern_util.h" @@ -316,8 +317,6 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len, } } -#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) - extern int __syscall_stub_start, __binary_start; void setup_physmem(unsigned long start, unsigned long reserve_end, |