Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a9835c authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds
Browse files

[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: default avatarDave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 95144c78

arch/alpha/kernel/setup.c

+1 −8
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/root_dev.h>

#include <linux/initrd.h>

#include <linux/eisa.h>

#include <linux/pfn.h>

#ifdef CONFIG_MAGIC_SYSRQ

#include <linux/sysrq.h>

#include <linux/reboot.h>
@@ -241,9 +242,6 @@ reserve_std_resources(void) 
		request_resource(io, standard_io_resources+i);

}



#define PFN_UP(x)	(((x) + PAGE_SIZE-1) >> PAGE_SHIFT)

#define PFN_DOWN(x)	((x) >> PAGE_SHIFT)

#define PFN_PHYS(x)	((x) << PAGE_SHIFT)

#define PFN_MAX		PFN_DOWN(0x80000000)

#define for_each_mem_cluster(memdesc, cluster, i)		\

	for ((cluster) = (memdesc)->cluster, (i) = 0;		\
@@ -472,11 +470,6 @@ page_is_ram(unsigned long pfn) 
	return 0;

}



#undef PFN_UP

#undef PFN_DOWN

#undef PFN_PHYS

#undef PFN_MAX



void __init

setup_arch(char **cmdline_p)

{

arch/alpha/mm/numa.c

+1 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/bootmem.h>

#include <linux/swap.h>

#include <linux/initrd.h>

#include <linux/pfn.h>



#include <asm/hwrpb.h>

#include <asm/pgalloc.h>
@@ -27,9 +28,6 @@ bootmem_data_t node_bdata[MAX_NUMNODES]; 
#define DBGDCONT(args...)

#endif



#define PFN_UP(x)       (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)

#define PFN_DOWN(x)     ((x) >> PAGE_SHIFT)

#define PFN_PHYS(x)     ((x) << PAGE_SHIFT)

#define for_each_mem_cluster(memdesc, cluster, i)		\

	for ((cluster) = (memdesc)->cluster, (i) = 0;		\

	     (i) < (memdesc)->numclusters; (i)++, (cluster)++)

arch/arm26/mm/init.c

+1 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/initrd.h>

#include <linux/bootmem.h>

#include <linux/blkdev.h>

#include <linux/pfn.h>



#include <asm/segment.h>

#include <asm/mach-types.h>
@@ -101,12 +102,6 @@ struct node_info { 
	int bootmap_pages;

};



#define PFN_DOWN(x)	((x) >> PAGE_SHIFT)

#define PFN_UP(x)	(PAGE_ALIGN(x) >> PAGE_SHIFT)

#define PFN_SIZE(x)	((x) >> PAGE_SHIFT)

#define PFN_RANGE(s,e)	PFN_SIZE(PAGE_ALIGN((unsigned long)(e)) - \

				(((unsigned long)(s)) & PAGE_MASK))



/*

 * FIXME: We really want to avoid allocating the bootmap bitmap

 * over the top of the initrd.  Hopefully, this is located towards

arch/cris/kernel/setup.c

+1 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/seq_file.h>

#include <linux/tty.h>

#include <linux/utsname.h>

#include <linux/pfn.h>



#include <asm/setup.h>
@@ -88,10 +89,6 @@ setup_arch(char **cmdline_p) 
	init_mm.end_data =   (unsigned long) &_edata;

	init_mm.brk =        (unsigned long) &_end;



#define PFN_UP(x)       (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)

#define PFN_DOWN(x)     ((x) >> PAGE_SHIFT)

#define PFN_PHYS(x)     ((x) << PAGE_SHIFT)



	/* min_low_pfn points to the start of DRAM, start_pfn points

	 * to the first DRAM pages after the kernel, and max_low_pfn

	 * to the end of DRAM.

arch/i386/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/kexec.h>

#include <linux/crash_dump.h>

#include <linux/dmi.h>

#include <linux/pfn.h>



#include <video/edid.h>