mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
[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 <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
95144c788d
commit
22a9835c35
23 changed files with 29 additions and 68 deletions
|
|
@ -45,9 +45,6 @@ extern void __init prom_init_cmdline(void);
|
|||
extern unsigned long __init prom_get_memsize(void);
|
||||
extern void __init it8172_init_ram_resource(unsigned long memsize);
|
||||
|
||||
#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
|
||||
#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
|
||||
|
||||
const char *get_system_type(void)
|
||||
{
|
||||
return "Globespan IVR";
|
||||
|
|
|
|||
|
|
@ -45,9 +45,6 @@ extern void __init prom_init_cmdline(void);
|
|||
extern unsigned long __init prom_get_memsize(void);
|
||||
extern void __init it8172_init_ram_resource(unsigned long memsize);
|
||||
|
||||
#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
|
||||
#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
|
||||
|
||||
const char *get_system_type(void)
|
||||
{
|
||||
return "ITE QED-4N-S01B";
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
#include <linux/highmem.h>
|
||||
#include <linux/console.h>
|
||||
#include <linux/mmzone.h>
|
||||
#include <linux/pfn.h>
|
||||
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/bootinfo.h>
|
||||
|
|
@ -257,10 +258,6 @@ static inline int parse_rd_cmdline(unsigned long* rd_start, unsigned long* rd_en
|
|||
return 0;
|
||||
}
|
||||
|
||||
#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 MAXMEM HIGHMEM_START
|
||||
#define MAXMEM_PFN PFN_DOWN(MAXMEM)
|
||||
|
||||
|
|
@ -493,10 +490,6 @@ static inline void resource_init(void)
|
|||
}
|
||||
}
|
||||
|
||||
#undef PFN_UP
|
||||
#undef PFN_DOWN
|
||||
#undef PFN_PHYS
|
||||
|
||||
#undef MAXMEM
|
||||
#undef MAXMEM_PFN
|
||||
|
||||
|
|
|
|||
|
|
@ -49,9 +49,6 @@ static char *mtypes[3] = {
|
|||
/* References to section boundaries */
|
||||
extern char _end;
|
||||
|
||||
#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
|
||||
|
||||
|
||||
struct prom_pmemblock * __init prom_getmdesc(void)
|
||||
{
|
||||
char *memsize_str;
|
||||
|
|
@ -109,10 +106,10 @@ struct prom_pmemblock * __init prom_getmdesc(void)
|
|||
|
||||
mdesc[3].type = yamon_dontuse;
|
||||
mdesc[3].base = 0x00100000;
|
||||
mdesc[3].size = CPHYSADDR(PFN_ALIGN(&_end)) - mdesc[3].base;
|
||||
mdesc[3].size = CPHYSADDR(PAGE_ALIGN(&_end)) - mdesc[3].base;
|
||||
|
||||
mdesc[4].type = yamon_free;
|
||||
mdesc[4].base = CPHYSADDR(PFN_ALIGN(&_end));
|
||||
mdesc[4].base = CPHYSADDR(PAGE_ALIGN(&_end));
|
||||
mdesc[4].size = memsize - mdesc[4].base;
|
||||
|
||||
return &mdesc[0];
|
||||
|
|
|
|||
|
|
@ -42,9 +42,6 @@ static char *mtypes[3] = {
|
|||
/* References to section boundaries */
|
||||
extern char _end;
|
||||
|
||||
#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
|
||||
|
||||
|
||||
struct prom_pmemblock * __init prom_getmdesc(void)
|
||||
{
|
||||
unsigned int memsize;
|
||||
|
|
@ -64,10 +61,10 @@ struct prom_pmemblock * __init prom_getmdesc(void)
|
|||
|
||||
mdesc[2].type = simmem_reserved;
|
||||
mdesc[2].base = 0x00100000;
|
||||
mdesc[2].size = CPHYSADDR(PFN_ALIGN(&_end)) - mdesc[2].base;
|
||||
mdesc[2].size = CPHYSADDR(PAGE_ALIGN(&_end)) - mdesc[2].base;
|
||||
|
||||
mdesc[3].type = simmem_free;
|
||||
mdesc[3].base = CPHYSADDR(PFN_ALIGN(&_end));
|
||||
mdesc[3].base = CPHYSADDR(PAGE_ALIGN(&_end));
|
||||
mdesc[3].size = memsize - mdesc[3].base;
|
||||
|
||||
return &mdesc[0];
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include <linux/highmem.h>
|
||||
#include <linux/swap.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/pfn.h>
|
||||
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/cachectl.h>
|
||||
|
|
@ -177,9 +178,6 @@ void __init paging_init(void)
|
|||
free_area_init(zones_size);
|
||||
}
|
||||
|
||||
#define PFN_UP(x) (((x) + PAGE_SIZE - 1) >> PAGE_SHIFT)
|
||||
#define PFN_DOWN(x) ((x) >> PAGE_SHIFT)
|
||||
|
||||
static inline int page_is_ram(unsigned long pagenr)
|
||||
{
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include <linux/nodemask.h>
|
||||
#include <linux/swap.h>
|
||||
#include <linux/bootmem.h>
|
||||
#include <linux/pfn.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/sections.h>
|
||||
|
||||
|
|
@ -28,8 +29,6 @@
|
|||
#include <asm/sn/sn_private.h>
|
||||
|
||||
|
||||
#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
|
||||
|
||||
#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)
|
||||
#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue