PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures (v2)

PATCH In review Andrea Righi 2 participants 5 messages Jun 15, 2008 – Jun 19, 2008

Subsystems (20)

Network drivers Memory management Arm (32-bit) Media (V4L/DVB) +16 more subsystems

lore

Share & tools

lore

Andrea Righi

author

2008-06-15 15:23 UTC #0 lore raw

PATCH 1/1 PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures (v2)

On 32-bit architectures PAGE_ALIGN() truncates 64-bit values to the 32-bit boundary. For example:

	u64 val = PAGE_ALIGN(size);

always returns a value < 4GB even if size is greater than 4GB.

The problem resides in PAGE_MASK definition (from include/asm-x86/page.h for example):

 #define PAGE_SHIFT      12
 #define PAGE_SIZE       (_AC(1,UL) << PAGE_SHIFT)
 #define PAGE_MASK       (~(PAGE_SIZE-1))

...
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)

The "~" is performed on a 32-bit value, so everything in "and" with PAGE_MASK greater than 4GB will be truncated to the 32-bit boundary. Using the ALIGN() macro seems to be the right way, because it uses typeof(addr) for the mask.

Also move the PAGE_ALIGN() definitions out of include/asm-*/page.h in include/linux/mm.h.

See also lkml discussion: http://lkml.org/lkml/2008/6/11/237

ChangeLog: v1 -> v2
- fix some PAGE_ALIGN() undefined references due to the move of PAGE_ALIGN definition in linux/mm.h

Signed-off-by Andrea Righi <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---
 arch/arm/kernel/module.c                     |    1 +
 arch/arm/plat-omap/fb.c                      |    1 +
 arch/avr32/mm/ioremap.c                      |    1 +
 arch/h8300/kernel/setup.c                    |    1 +
 arch/m68k/amiga/chipram.c                    |    1 +
 arch/m68knommu/kernel/setup.c                |    1 +
 arch/mips/kernel/module.c                    |    1 +
 arch/mips/sgi-ip27/ip27-klnuma.c             |    1 +
 arch/powerpc/boot/of.c                       |    1 +
 arch/powerpc/boot/page.h                     |    3 ---
 arch/powerpc/kernel/suspend.c                |    1 +
 arch/ppc/boot/simple/misc-embedded.c         |    1 +
 arch/ppc/boot/simple/misc.c                  |    1 +
 arch/sparc64/kernel/iommu_common.h           |    2 +-
 arch/x86/kernel/module_64.c                  |    1 +
 arch/xtensa/kernel/setup.c                   |    1 +
 drivers/char/random.c                        |    1 +
 drivers/ieee1394/iso.c                       |    1 +
 drivers/media/video/pvrusb2/pvrusb2-ioread.c |    1 +
 drivers/media/video/videobuf-core.c          |    1 +
 drivers/mtd/maps/uclinux.c                   |    1 +
 drivers/net/mlx4/eq.c                        |    1 +
 drivers/pci/intel-iommu.h                    |    2 +-
 drivers/pcmcia/electra_cf.c                  |    1 +
 drivers/scsi/sun_esp.c                       |    1 +
 drivers/video/acornfb.c                      |    1 +
 drivers/video/clps711xfb.c                   |    1 +
 drivers/video/imxfb.c                        |    1 +
 drivers/video/omap/dispc.c                   |    1 +
 drivers/video/omap/omapfb_main.c             |    1 +
 drivers/video/pxafb.c                        |    1 +
 drivers/video/sa1100fb.c                     |    1 +
 include/asm-alpha/page.h                     |    3 ---
 include/asm-arm/page-nommu.h                 |    4 +---
 include/asm-arm/page.h                       |    3 ---
 include/asm-avr32/page.h                     |    3 ---
 include/asm-blackfin/page.h                  |    3 ---
 include/asm-cris/page.h                      |    3 ---
 include/asm-frv/page.h                       |    3 ---
 include/asm-h8300/page.h                     |    3 ---
 include/asm-ia64/page.h                      |    1 -
 include/asm-m32r/page.h                      |    3 ---
 include/asm-m68k/dvma.h                      |    2 +-
 include/asm-m68k/page.h                      |    3 ---
 include/asm-m68knommu/page.h                 |    3 ---
 include/asm-mips/page.h                      |    3 ---
 include/asm-mn10300/page.h                   |    3 ---
 include/asm-parisc/page.h                    |    4 ----
 include/asm-powerpc/page.h                   |    3 ---
 include/asm-ppc/page.h                       |    4 ----
 include/asm-s390/page.h                      |    3 ---
 include/asm-sh/page.h                        |    3 ---
 include/asm-sparc/page.h                     |    3 ---
 include/asm-sparc64/page.h                   |    3 ---
 include/asm-um/page.h                        |    3 ---
 include/asm-x86/page.h                       |    3 ---
 include/asm-xtensa/page.h                    |    2 --
 include/linux/mm.h                           |    3 +++
 sound/core/info.c                            |    1 +
 59 files changed, 37 insertions(+), 77 deletions(-)

arch/arm/kernel/module.c +1 -0

index 79b7e5c..81891a2 100644
@@ -14,6 +14,7 @@
 #include <linux/moduleloader.h>
 #include <linux/kernel.h>
 #include <linux/elf.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
 #include <linux/fs.h>

arch/arm/plat-omap/fb.c +1 -0

index 96d6f06..5d10752 100644
@@ -23,6 +23,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/bootmem.h>

arch/avr32/mm/ioremap.c +1 -0

index 3437c82..f03b79f 100644
@@ -6,6 +6,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/vmalloc.h>
+#include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/io.h>

arch/h8300/kernel/setup.c +1 -0

index b1f25c2..7fda657 100644
@@ -20,6 +20,7 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/fb.h>
 #include <linux/console.h>

arch/m68k/amiga/chipram.c +1 -0

index cbe3653..61df1d3 100644
@@ -9,6 +9,7 @@
 
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>

arch/m68knommu/kernel/setup.c +1 -0

index 03f4fe6..5985f19 100644
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/module.h>
+#include <linux/mm.h>
 #include <linux/console.h>
 #include <linux/errno.h>
 #include <linux/string.h>

arch/mips/kernel/module.c +1 -0

index e7ed0ac..a418b26 100644
@@ -28,6 +28,7 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/mm.h>
 #include <linux/spinlock.h>
 #include <asm/pgtable.h>	/* MODULE_START */

arch/mips/sgi-ip27/ip27-klnuma.c +1 -0

index 48932ce..d9c79d8 100644
@@ -4,6 +4,7 @@
  * Copyright 2000 - 2001 Kanoj Sarcar ([email protected])
  */
 #include <linux/init.h>
+#include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/kernel.h>
 #include <linux/nodemask.h>

arch/powerpc/boot/of.c +1 -0

index 61d9899..6bc72b1 100644
@@ -8,6 +8,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <linux/mm.h>
 #include "types.h"
 #include "elf.h"
 #include "string.h"

arch/powerpc/boot/page.h +0 -3

index 14eca30..aa42298 100644
@@ -28,7 +28,4 @@
 /* align addr on a size boundary - adjust address up if needed */
 #define _ALIGN(addr,size)     _ALIGN_UP(addr,size)
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	_ALIGN(addr, PAGE_SIZE)
-
 #endif				/* _PPC_BOOT_PAGE_H */

arch/powerpc/kernel/suspend.c +1 -0

index 8cee571..6fc6328 100644
@@ -7,6 +7,7 @@
  * Copyright (c) 2001 Patrick Mochel <[email protected]>
  */
 
+#include <linux/mm.h>
 #include <asm/page.h>
 
 /* References to section boundaries */

arch/ppc/boot/simple/misc-embedded.c +1 -0

index d5a00eb..e390cb7 100644
@@ -8,6 +8,7 @@
 
 #include <linux/types.h>
 #include <linux/string.h>
+#include <linux/mm.h>
 #include <asm/bootinfo.h>
 #include <asm/mmu.h>
 #include <asm/page.h>

arch/ppc/boot/simple/misc.c +1 -0

index c3d3305..8c334a2 100644
@@ -16,6 +16,7 @@
 
 #include <linux/types.h>
 #include <linux/string.h>
+#include <linux/mm.h>
 
 #include <asm/page.h>
 #include <asm/mmu.h>

arch/sparc64/kernel/iommu_common.h +1 -1

index f3575a6..53b19c8 100644
@@ -23,7 +23,7 @@
 #define IO_PAGE_SHIFT			13
 #define IO_PAGE_SIZE			(1UL << IO_PAGE_SHIFT)
 #define IO_PAGE_MASK			(~(IO_PAGE_SIZE-1))
-#define IO_PAGE_ALIGN(addr)		(((addr)+IO_PAGE_SIZE-1)&IO_PAGE_MASK)
+#define IO_PAGE_ALIGN(addr)		ALIGN(addr, IO_PAGE_SIZE)
 
 #define IO_TSB_ENTRIES			(128*1024)
 #define IO_TSB_SIZE			(IO_TSB_ENTRIES * 8)

arch/x86/kernel/module_64.c +1 -0

index a888e67..adcab87 100644
@@ -20,6 +20,7 @@
 #include <linux/elf.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
+#include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>

arch/xtensa/kernel/setup.c +1 -0

index 5e6d75c..a00359e 100644
@@ -16,6 +16,7 @@
 
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/mm.h>
 #include <linux/proc_fs.h>
 #include <linux/screen_info.h>
 #include <linux/bootmem.h>

drivers/char/random.c +1 -0

index 0cf98bd..e0d0e37 100644
@@ -236,6 +236,7 @@
 #include <linux/fs.h>
 #include <linux/genhd.h>
 #include <linux/interrupt.h>
+#include <linux/mm.h>
 #include <linux/spinlock.h>
 #include <linux/percpu.h>
 #include <linux/cryptohash.h>

drivers/ieee1394/iso.c +1 -0

index 07ca35c..1cf6487 100644
@@ -11,6 +11,7 @@
 
 #include <linux/pci.h>
 #include <linux/sched.h>
+#include <linux/mm.h>
 #include <linux/slab.h>
 
 #include "hosts.h"

drivers/media/video/pvrusb2/pvrusb2-ioread.c +1 -0

index 05a1376..b482478 100644
@@ -22,6 +22,7 @@
 #include "pvrusb2-debug.h"
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <asm/uaccess.h>

drivers/media/video/videobuf-core.c +1 -0

index 0a88c44..b7b0584 100644
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>

drivers/mtd/maps/uclinux.c +1 -0

index bac000a..eca31a5 100644
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/major.h>
 #include <linux/mtd/mtd.h>

drivers/net/mlx4/eq.c +1 -0

index 4ca78aa..7df928d 100644
@@ -33,6 +33,7 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/mm.h>
 #include <linux/dma-mapping.h>
 
 #include <linux/mlx4/cmd.h>

drivers/pci/intel-iommu.h +1 -1

index afc0ad9..339da69 100644
@@ -35,7 +35,7 @@
 #define PAGE_SHIFT_4K		(12)
 #define PAGE_SIZE_4K		(1UL << PAGE_SHIFT_4K)
 #define PAGE_MASK_4K		(((u64)-1) << PAGE_SHIFT_4K)
-#define PAGE_ALIGN_4K(addr)	(((addr) + PAGE_SIZE_4K - 1) & PAGE_MASK_4K)
+#define PAGE_ALIGN_4K(addr)	ALIGN(addr, PAGE_SIZE_4K)
 
 #define IOVA_PFN(addr)		((addr) >> PAGE_SHIFT_4K)
 #define DMA_32BIT_PFN		IOVA_PFN(DMA_32BIT_MASK)

drivers/pcmcia/electra_cf.c +1 -0

index 52d0aa8..257039e 100644
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
 
 #include <pcmcia/ss.h>

drivers/scsi/sun_esp.c +1 -0

index 2c87db9..f9cf701 100644
@@ -7,6 +7,7 @@
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/mm.h>
 #include <linux/init.h>
 
 #include <asm/irq.h>

drivers/video/acornfb.c +1 -0

index eedb828..017233d 100644
@@ -23,6 +23,7 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/fb.h>
 #include <linux/platform_device.h>

drivers/video/clps711xfb.c +1 -0

index 9f8a389..bd017f2 100644
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>

drivers/video/imxfb.c +1 -0

index 94e4d3a..0c5a475 100644
@@ -24,6 +24,7 @@
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/init.h>

drivers/video/omap/dispc.c +1 -0

index ab32ceb..ab77c51 100644
@@ -20,6 +20,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/clk.h>
 #include <linux/io.h>

drivers/video/omap/omapfb_main.c +1 -0

index 14d0f7a..f85af5c 100644
@@ -25,6 +25,7 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <linux/platform_device.h>
+#include <linux/mm.h>
 #include <linux/uaccess.h>
 
 #include <asm/mach-types.h>

drivers/video/pxafb.c +1 -0

index 778b250..dc98c3b 100644
@@ -30,6 +30,7 @@
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/init.h>

drivers/video/sa1100fb.c +1 -0

index 2dd1b8a..78bcdbc 100644
@@ -167,6 +167,7 @@
 #include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/init.h>

include/asm-alpha/page.h +0 -3

index 22ff976..0995f9d 100644
@@ -80,9 +80,6 @@ typedef struct page *pgtable_t;
 
 #endif /* !__ASSEMBLY__ */
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 #define __pa(x)			((unsigned long) (x) - PAGE_OFFSET)
 #define __va(x)			((void *)((unsigned long) (x) + PAGE_OFFSET))
 #ifndef CONFIG_DISCONTIGMEM

include/asm-arm/page-nommu.h +1 -3

index a1bcad0..ea1cde8 100644
@@ -7,6 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
 #ifndef _ASMARM_PAGE_NOMMU_H
 #define _ASMARM_PAGE_NOMMU_H

@@ -42,9 +43,6 @@ typedef unsigned long pgprot_t;
 #define __pmd(x)        (x)
 #define __pgprot(x)     (x)
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 extern unsigned long memory_start;
 extern unsigned long memory_end;

include/asm-arm/page.h +0 -3

index 8e05bdb..7c5fc55 100644
@@ -15,9 +15,6 @@
 #define PAGE_SIZE		(1UL << PAGE_SHIFT)
 #define PAGE_MASK		(~(PAGE_SIZE-1))
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 #ifndef __ASSEMBLY__
 
 #ifndef CONFIG_MMU

include/asm-avr32/page.h +0 -3

index cbbc5ca..f805d1c 100644
@@ -57,9 +57,6 @@ static inline int get_order(unsigned long size)
 
 #endif /* !__ASSEMBLY__ */
 
-/* Align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & PAGE_MASK)
-
 /*
  * The hardware maps the virtual addresses 0x80000000 -> 0x9fffffff
  * permanently to the physical addresses 0x00000000 -> 0x1fffffff when

include/asm-blackfin/page.h +0 -3

index c7db022..344f6a8 100644
@@ -51,9 +51,6 @@ typedef struct page *pgtable_t;
 #define __pgd(x)	((pgd_t) { (x) } )
 #define __pgprot(x)	((pgprot_t) { (x) } )
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 extern unsigned long memory_start;
 extern unsigned long memory_end;

include/asm-cris/page.h +0 -3

index c45bb1e..d19272b 100644
@@ -60,9 +60,6 @@ typedef struct page *pgtable_t;
 
 #define page_to_phys(page)     __pa((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 #ifndef __ASSEMBLY__
 
 #endif /* __ASSEMBLY__ */

include/asm-frv/page.h +0 -3

index c2c1e89..bd9c220 100644
@@ -40,9 +40,6 @@ typedef struct page *pgtable_t;
 #define __pgprot(x)	((pgprot_t) { (x) } )
 #define PTE_MASK	PAGE_MASK
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & PAGE_MASK)
-
 #define devmem_is_allowed(pfn)	1
 
 #define __pa(vaddr)		virt_to_phys((void *) (unsigned long) (vaddr))

include/asm-h8300/page.h +0 -3

index d6a3eaf..0b6acf0 100644
@@ -43,9 +43,6 @@ typedef struct page *pgtable_t;
 #define __pgd(x)	((pgd_t) { (x) } )
 #define __pgprot(x)	((pgprot_t) { (x) } )
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 extern unsigned long memory_start;
 extern unsigned long memory_end;

include/asm-ia64/page.h +0 -1

index 36f3932..5f271bc 100644
@@ -40,7 +40,6 @@
 
 #define PAGE_SIZE		(__IA64_UL_CONST(1) << PAGE_SHIFT)
 #define PAGE_MASK		(~(PAGE_SIZE - 1))
-#define PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & PAGE_MASK)
 
 #define PERCPU_PAGE_SHIFT	16	/* log2() of max. size of per-CPU area */
 #define PERCPU_PAGE_SIZE	(__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT)

include/asm-m32r/page.h +0 -3

index 8a677f3..c933308 100644
@@ -41,9 +41,6 @@ typedef struct page *pgtable_t;
 
 #endif /* !__ASSEMBLY__ */
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & PAGE_MASK)
-
 /*
  * This handles the memory map.. We could make this a config
  * option, but too many people screw it up, and too few need

include/asm-m68k/dvma.h +1 -1

index 5d28631..5bd2435 100644
@@ -13,7 +13,7 @@
 #define DVMA_PAGE_SHIFT	13
 #define DVMA_PAGE_SIZE	(1UL << DVMA_PAGE_SHIFT)
 #define DVMA_PAGE_MASK	(~(DVMA_PAGE_SIZE-1))
-#define DVMA_PAGE_ALIGN(addr)	(((addr)+DVMA_PAGE_SIZE-1)&DVMA_PAGE_MASK)
+#define DVMA_PAGE_ALIGN(addr)	ALIGN(addr, DVMA_PAGE_SIZE)
 
 extern void dvma_init(void);
 extern int dvma_map_iommu(unsigned long kaddr, unsigned long baddr,

include/asm-m68k/page.h +0 -3

index 880c2cb..a34b8ba 100644
@@ -103,9 +103,6 @@ typedef struct page *pgtable_t;
 #define __pgd(x)	((pgd_t) { (x) } )
 #define __pgprot(x)	((pgprot_t) { (x) } )
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 #endif /* !__ASSEMBLY__ */
 
 #include <asm/page_offset.h>

include/asm-m68knommu/page.h +0 -3

index 1e82ebb..3a1ede4 100644
@@ -43,9 +43,6 @@ typedef struct page *pgtable_t;
 #define __pgd(x)	((pgd_t) { (x) } )
 #define __pgprot(x)	((pgprot_t) { (x) } )
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 extern unsigned long memory_start;
 extern unsigned long memory_end;

include/asm-mips/page.h +0 -3

index 8735aa0..dd1cc0a 100644
@@ -134,9 +134,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #endif /* !__ASSEMBLY__ */
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & PAGE_MASK)
-
 /*
  * __pa()/__va() should be used only during mem init.
  */

include/asm-mn10300/page.h +0 -3

index 124971b..8288e12 100644
@@ -61,9 +61,6 @@ typedef struct page *pgtable_t;
 
 #endif /* !__ASSEMBLY__ */
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & PAGE_MASK)
-
 /*
  * This handles the memory map.. We could make this a config
  * option, but too many people screw it up, and too few need

include/asm-parisc/page.h +0 -4

index 27d50b8..c3941f0 100644
@@ -119,10 +119,6 @@ extern int npmem_ranges;
 #define PMD_ENTRY_SIZE	(1UL << BITS_PER_PMD_ENTRY)
 #define PTE_ENTRY_SIZE	(1UL << BITS_PER_PTE_ENTRY)
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
-
 #define LINUX_GATEWAY_SPACE     0
 
 /* This governs the relationship between virtual and physical addresses.

include/asm-powerpc/page.h +0 -3

index cffdf0e..e088545 100644
@@ -119,9 +119,6 @@ extern phys_addr_t kernstart_addr;
 /* align addr on a size boundary - adjust address up if needed */
 #define _ALIGN(addr,size)     _ALIGN_UP(addr,size)
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	_ALIGN(addr, PAGE_SIZE)
-
 /*
  * Don't compare things with KERNELBASE or PAGE_OFFSET to test for
  * "kernelness", use is_kernel_addr() - it should do what you want.

include/asm-ppc/page.h +0 -4

index 37e4756..6a53965 100644
@@ -43,10 +43,6 @@ typedef unsigned long pte_basic_t;
 /* align addr on a size boundary - adjust address up if needed */
 #define _ALIGN(addr,size)     _ALIGN_UP(addr,size)
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	_ALIGN(addr, PAGE_SIZE)
-
-
 #undef STRICT_MM_TYPECHECKS
 
 #ifdef STRICT_MM_TYPECHECKS

include/asm-s390/page.h +0 -3

index 12fd9c4..991ba93 100644
@@ -138,9 +138,6 @@ void arch_alloc_page(struct page *page, int order);
 
 #endif /* !__ASSEMBLY__ */
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)        (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 #define __PAGE_OFFSET           0x0UL
 #define PAGE_OFFSET             0x0UL
 #define __pa(x)                 (unsigned long)(x)

include/asm-sh/page.h +0 -3

index 3b305ca..77fb8bf 100644
@@ -24,9 +24,6 @@
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 #define PTE_MASK	PAGE_MASK
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 #if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
 #define HPAGE_SHIFT	16
 #elif defined(CONFIG_HUGETLB_PAGE_SIZE_256K)

include/asm-sparc/page.h +0 -3

index 6aa9e4c..a5029f2 100644
@@ -136,9 +136,6 @@ BTFIXUPDEF_SETHI(sparc_unmapped_base)
 
 #endif /* !(__ASSEMBLY__) */
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)  (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 #define PAGE_OFFSET	0xf0000000
 #ifndef __ASSEMBLY__
 extern unsigned long phys_base;

include/asm-sparc64/page.h +0 -3

index 93f0881..c36a4ba 100644
@@ -110,9 +110,6 @@ typedef struct page *pgtable_t;
 
 #endif /* !(__ASSEMBLY__) */
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 /* We used to stick this into a hard-coded global register (%g4)
  * but that does not make sense anymore.
  */

include/asm-um/page.h +0 -3

index 93655eb..a6df1f1 100644
@@ -92,9 +92,6 @@ typedef struct page *pgtable_t;
 #define __pgd(x) ((pgd_t) { (x) } )
 #define __pgprot(x)	((pgprot_t) { (x) } )
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 extern unsigned long uml_physmem;
 
 #define PAGE_OFFSET (uml_physmem)

include/asm-x86/page.h +0 -3

index f409643..534f6f7 100644
@@ -31,9 +31,6 @@
 
 #define HUGE_MAX_HSTATE 2
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
 #ifndef __ASSEMBLY__
 #include <linux/types.h>
 #endif

include/asm-xtensa/page.h +0 -2

index 80a6ae0..11f7dc2 100644
@@ -26,13 +26,11 @@
 
 /*
  * PAGE_SHIFT determines the page size
- * PAGE_ALIGN(x) aligns the pointer to the (next) page boundary
  */
 
 #define PAGE_SHIFT		12
 #define PAGE_SIZE		(__XTENSA_UL_CONST(1) << PAGE_SHIFT)
 #define PAGE_MASK		(~(PAGE_SIZE-1))
-#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE - 1) & PAGE_MASK)
 
 #define PAGE_OFFSET		XCHAL_KSEG_CACHED_VADDR
 #define MAX_MEM_PFN		XCHAL_KSEG_SIZE

include/linux/mm.h +3 -0

index 460128d..4c36e83 100644
@@ -41,6 +41,9 @@ extern unsigned long mmap_min_addr;
 
 #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))
 
+/* to align the pointer to the (next) page boundary */
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
+
 /*
  * Linux kernel virtual memory manager primitives.
  * The idea being to have a "virtual" mm in the same way

sound/core/info.c +1 -0

index cb5ead3..60edb0a 100644
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/time.h>
 #include <linux/smp_lock.h>
+#include <linux/mm.h>
 #include <linux/string.h>
 #include <sound/core.h>
 #include <sound/minors.h>

Signature · 1 line

1.5.4.3

Andrea Righi

author

2008-06-15 15:54 UTC #1 lore raw

Quoted 8 lines · Andrea Righi

Also move the PAGE_ALIGN() definitions out of include/asm-*/page.h in include/linux/mm.h.
See also lkml discussion: http://lkml.org/lkml/2008/6/11/237
ChangeLog: v1 -> v2
- fix some PAGE_ALIGN() undefined references due to the move of PAGE_ALIGN definition in linux/mm.h

BTW, I've used the following script to discover the missing inclusions of <linux/mm.h> in files of the different archs that use PAGE_ALIGN().

I don't know if there's a better way to check this (well... obviously except recompiling everything on all the architectures).

I'm posting the script here, maybe it could be useful also for other similar stuff.

It just greps the direct and indirect .h inclusions (up to a maximum level of 5 indirect inclusions, by default) in .c files and if it doesn't find the required #include (linux/mm.h in this case), it reports an error.

It does not cover #ifdefs and different CONFIGs, but it would be able at least to reduce potential build errors due to undefined references (of PAGE_ALIGN in this case). If there're no evident bugs the script should be able to provide a sufficient condition for correctness.

A downloadable version of the script is also available here:
http://download.systemimager.org/~arighi/linux/scripts/check-include.pl

For example to check if the files that use PAGE_ALIGN() include <linux/mm.h> on ia64 arch (without recompiling everything):

$ time check-include.pl --arch ia64 --include linux/mm.h \
`git-grep -l [^_]PAGE_ALIGN arch/ia64` \
`git-grep -l [^_]PAGE_ALIGN | grep -v '^arch\|^include\|\.h$'`
...

and on a intel core2 duo 1.2GHz it needs only:

real    0m5.229s
user    0m4.536s
sys     0m0.664s

-Andrea
---
#!/usr/bin/perl -w
#
# check-include.pl
#
# Description:
# Check if one or more C files (.c) in a Linux kernel tree directly or
# indirectly include a C header (.h).
#
# Copyright (C) 2008 Andrea Righi <[email protected]>

use strict;
use File::Basename;
use Getopt::Long;

my $VERSION = '0.1';
my $program_name = 'check-include.pl';

my $version_info = << "EOF";
$program_name v$VERSION

This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. EOF

my $help_info = $version_info . <<"EOF";

Usage: $program_name --include INCLUDE --arch ARCH [OPTION]... FILE...

Options:
--help, -h Display this output.

--version, -v Display version and copyright information.

--include, -i=INCLUDE Search INCLUDE inclusion, as specified in #include

			(i.e. linux/mm.h).

--arch, -a=ARCH Use assembly inclusions of the specified ARCH, the

			name of the arch must be the same as specified in
			include/asm-* (i.e. x86).

--level, -l=NUM Expand header inclusions up to NUM nested levels.
Beyond this limit we consider the inclusion missing. Default max level is: 5.
EOF

select(STDERR);
$| = 1;
select(STDOUT);
$| = 1;

Getopt::Long::Configure("posix_default");
Getopt::Long::Configure("no_gnu_compat");
Getopt::Long::Configure("bundling");
GetOptions(

	"help|h"	=> \my $help,
	"version|v"	=> \my $version,
	"include|i=s"	=> \my $include,
	"arch|a=s"	=> \my $arch,
	"level|l=i"	=> \my $level,

) or die("$help_info");

if ($help) {
	print "$help_info";
	exit(0);
}
if ($version) {
	print "$version_info";
	exit(0);
}
unless ($include) {
	print STDERR "ERROR: --include option is mandatory\n";
	print "\n$help_info";
	exit(1);
}
unless ($arch) {
	print STDERR "ERROR: --arch option is mandatory\n";
	print "\n$help_info";
	exit(1);
}
unless ($level) {
	$level = 5;
}

# try to evaluate if we're in a Linux kernel tree
# TODO: there're surely better ways to do so...
unless ((-f 'README') && (-f 'MAINTAINERS')) {
	die("fatal: not a Linux kernel tree\n");
}

my @files = sort_unique(@ARGV);

unless (@files) {
	print "no file specified\n";
	exit(0);
}

my $ret = 0;
my $cache;

foreach my $file (@files) {
	if ($file !~ /\.c$/) {
		print STDERR "$file: is not a C file\n";
		next;
	}
	if (! -f $file) {
		print STDERR "$file: does not exist\n";
		next;
	}
	print "checking $file : ";
	my $found = 0;
	for (my $i = 1; $i <= $level; $i++) {
		my @includes = get_includes($arch, $i, $include, $file);
		$_ = resolve_std_inc($arch, $include);
		if (grep(/^include\/$_$/, @includes) ||
		    !check_include($include, @includes)) {
			$found = 1;
			last;
		}
	}
	if ($found) {
		print "ok\n";
		next;
	}
	$ret = 1;
	print "$include was not found!\n";
}

exit($ret);

sub sort_unique

{
	my @in = @_;
	my %saw;
	@saw{@_} = ();
	return sort keys %saw;
}

sub resolve_std_inc {
	my $arch = shift;
	$_ = shift;
	s/include\/asm\//include\/asm-$arch\//;
	return $_;
}

sub resolve_loc_inc {
	my $file = shift;
	$_ = shift;
	return dirname($file) . "/$_";
}

sub get_includes {
	my ($arch, $level, $include, $file) = @_;
	my @includes = ();

	if ($cache->{$file}->{$level}) {
		goto out;
	}
	@_ = ($file);
	for (my $i = 1; $i <= $level; $i++) {
		if ($cache->{$file}->{$i}) {
			@_ = @{$cache->{$file}->{$i}};
			push(@includes, @_);
			next;
		}
		my @list = @_;
		@_ = ();
		foreach my $e (@list) {
			my $res = open(IN, "<$e");
			next unless($res);
			chomp(my @in = <IN>);
			close(IN);

			my @inc = grep(s/#include\s+<([^>]+)>.*/include\/$1/,
				       @in);
			if (@inc) {
				# Resolve assembly inclusions.
				map { $_ = resolve_std_inc($arch, $_) } @inc;
				push(@_, @inc);
			}

			@inc = grep(s/#include\s+"([^>]+)".*/$1/,
				       @in);
			if (@inc) {
				# Resolve local inclusions.
				map { $_ = resolve_loc_inc($e, $_) } @inc;
			        push(@_, @inc);
			}
		}
		last unless (@_);
		push(@includes, @_);
	}
	@{$cache->{$file}->{$level}} = sort_unique(@includes);
out:
	return @{$cache->{$file}->{$level}};
}

sub check_include {
	my ($include, @files) = @_;

	foreach (@files) {
		my $res = open(IN, "<$_");
		next unless ($res);
		chomp(my @in = <IN>);
		close(IN);
		return 0 if (grep(/#include\s+<$include>/, @in))
	}
	return -1;
}

__END__

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Paul Mackerras

2008-06-15 22:40 UTC #2 lore raw

In reply to Andrea Righi

Quoted 2 lines · Andrea Righi

Also move the PAGE_ALIGN() definitions out of include/asm-*/page.h in include/linux/mm.h.

I'd rather see it in some other place than this, because include/linux/mm.h is a large header that includes quite a lot of other stuff. What's wrong with leaving it in each arch's page.h and only changing it on those archs that have both 32-bit and 64-bit variants? Or perhaps there is some other, lower-level header in include/linux where it could go?

Quoted 17 lines

arch/powerpc/boot/of.c +1 -0

index 61d9899..6bc72b1 100644
@@ -8,6 +8,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <linux/mm.h>
 #include "types.h"
 #include "elf.h"
 #include "string.h"

arch/powerpc/boot/page.h +0 -0

index 14eca30..aa42298 100644

arch/powerpc/boot/page.h line 31

Quoted 7 lines

arch/powerpc/boot/page.h +0 -3

@@ -28,7 +28,4 @@
 /* align addr on a size boundary - adjust address up if needed */
 #define _ALIGN(addr,size)     _ALIGN_UP(addr,size)
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	_ALIGN(addr, PAGE_SIZE)
-
 #endif				/* _PPC_BOOT_PAGE_H */

These parts are NAKed, because arch/powerpc/boot is a separate program that doesn't use the kernel include files.

Quoted 5 lines

include/asm-powerpc/page.h +0 -0
index cffdf0e..e088545 100644

include/asm-powerpc/page.h extern phys_addr_t kernstart_addr; · line 124

Quoted 9 lines

include/asm-powerpc/page.h +0 -3

@@ -119,9 +119,6 @@ extern phys_addr_t kernstart_addr;
 /* align addr on a size boundary - adjust address up if needed */
 #define _ALIGN(addr,size)     _ALIGN_UP(addr,size)
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	_ALIGN(addr, PAGE_SIZE)
-
 /*
  * Don't compare things with KERNELBASE or PAGE_OFFSET to test for
  * "kernelness", use is_kernel_addr() - it should do what you want.

We had already come across this issue on powerpc, and we fixed it by making sure that the type of PAGE_MASK was int, not unsigned int. However, I have no objection to using the ALIGN() macro from include/linux/kernel.h instead.

Paul.

Andrea Righi

author

2008-06-16 08:35 UTC #3 lore raw

Quoted 11 lines · Paul Mackerras

Quoted 2 lines · Andrea Righi
Also move the PAGE_ALIGN() definitions out of include/asm-*/page.h in include/linux/mm.h.
I'd rather see it in some other place than this, because include/linux/mm.h is a large header that includes quite a lot of other stuff. What's wrong with leaving it in each arch's page.h and only changing it on those archs that have both 32-bit and 64-bit variants? Or perhaps there is some other, lower-level header in include/linux where it could go?

I think the only evident advantage of this is to have a single implementation, instead of dealing with (potentially) N different implementations.

Maybe a different place could be linux/mm_types.h, it's not so small, but at least it's smaller than linux/mm.h. However, it's a bit ugly to put a "function" in a file called mm_types.h.

Anyway, I've to say that fixing PAGE_ALIGN and leaving it in each page.h for now would be surely a simpler solution and would introduce less potential errors.

Quoted 21 lines

arch/powerpc/boot/of.c +1 -0

index 61d9899..6bc72b1 100644
@@ -8,6 +8,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <linux/mm.h>
 #include "types.h"
 #include "elf.h"
 #include "string.h"

arch/powerpc/boot/page.h +0 -0

index 14eca30..aa42298 100644
@@ -28,7 +28,4 @@
 /* align addr on a size boundary - adjust address up if needed */
 #define _ALIGN(addr,size)     _ALIGN_UP(addr,size)

Quoted 7 lines

arch/powerpc/boot/page.h line 31
Quoted 4 lines
arch/powerpc/boot/page.h +0 -3
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	_ALIGN(addr, PAGE_SIZE)
-
 #endif				/* _PPC_BOOT_PAGE_H */
These parts are NAKed, because arch/powerpc/boot is a separate program that doesn't use the kernel include files.

OK, so we also shouldn't use the linux/kernel.h's ALIGN() here, but leave the local _ALIGN() definition, right?

Quoted 9 lines

include/asm-powerpc/page.h +0 -0

index cffdf0e..e088545 100644
@@ -119,9 +119,6 @@ extern phys_addr_t kernstart_addr;
 /* align addr on a size boundary - adjust address up if needed */
 #define _ALIGN(addr,size)     _ALIGN_UP(addr,size)

Quoted 11 lines

include/asm-powerpc/page.h extern phys_addr_t kernstart_addr; · line 124
Quoted 6 lines
include/asm-powerpc/page.h +0 -3
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)	_ALIGN(addr, PAGE_SIZE)
-
 /*
  * Don't compare things with KERNELBASE or PAGE_OFFSET to test for
  * "kernelness", use is_kernel_addr() - it should do what you want.
We had already come across this issue on powerpc, and we fixed it by making sure that the type of PAGE_MASK was int, not unsigned int. However, I have no objection to using the ALIGN() macro from include/linux/kernel.h instead.

Thanks,
-Andrea

Andrea Righi

author

2008-06-19 15:57 UTC #4 lore raw

PATCH 1/1 PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures (v3)

In reply to Paul Mackerras

On 32-bit architectures PAGE_ALIGN() truncates 64-bit values to the 32-bit boundary. For example:

	u64 val = PAGE_ALIGN(size);

always returns a value < 4GB even if size is greater than 4GB.

The problem resides in PAGE_MASK definition (from include/asm-x86/page.h for example):

#define PAGE_SHIFT      12
#define PAGE_SIZE       (_AC(1,UL) << PAGE_SHIFT)
#define PAGE_MASK       (~(PAGE_SIZE-1))

...
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)

The "~" is performed on a 32-bit value, so everything in "and" with PAGE_MASK greater than 4GB will be truncated to the 32-bit boundary.

Using the ALIGN() macro seems to be the right way, because it uses typeof(addr) for the mask.

See also lkml discussion: http://lkml.org/lkml/2008/6/11/237

Changelog: (v2 -> v3)
- do not move PAGE_ALIGN() definition in linux/mm.h, fixing and leaving it in each page.h seems to be a safer solution right now

Signed-off-by Andrea Righi <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

arch/sparc64/kernel/iommu_common.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/arch/sparc64/kernel/iommu_common.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/arch/sparc64/kernel/iommu_common.h
@@ -23,7 +23,7 @@

#define IO_PAGE_SHIFT 13
#define IO_PAGE_SIZE (1UL << IO_PAGE_SHIFT)
#define IO_PAGE_MASK (~(IO_PAGE_SIZE-1))
-#define IO_PAGE_ALIGN(addr) (((addr)+IO_PAGE_SIZE-1)&IO_PAGE_MASK)
+#define IO_PAGE_ALIGN(addr) ALIGN(addr, IO_PAGE_SIZE)

#define IO_TSB_ENTRIES (128*1024)
#define IO_TSB_SIZE (IO_TSB_ENTRIES * 8)

drivers/pci/intel-iommu.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/drivers/pci/intel-iommu.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/drivers/pci/intel-iommu.h
@@ -35,7 +35,7 @@

#define PAGE_SHIFT_4K (12)
#define PAGE_SIZE_4K (1UL << PAGE_SHIFT_4K)
#define PAGE_MASK_4K (((u64)-1) << PAGE_SHIFT_4K)
-#define PAGE_ALIGN_4K(addr) (((addr) + PAGE_SIZE_4K - 1) & PAGE_MASK_4K)
+#define PAGE_ALIGN_4K(addr) ALIGN(addr, PAGE_SIZE_4K)

#define IOVA_PFN(addr) ((addr) >> PAGE_SHIFT_4K)
#define DMA_32BIT_PFN IOVA_PFN(DMA_32BIT_MASK)

include/asm-alpha/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-alpha/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-alpha/page.h
@@ -81,7 +81,7 @@ typedef struct page *pgtable_t;

#endif /* !__ASSEMBLY__ */

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
#define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))

include/asm-arm/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-arm/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-arm/page.h
@@ -16,7 +16,7 @@

#define PAGE_MASK (~(PAGE_SIZE-1))

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#ifndef __ASSEMBLY__

include/asm-arm/page-nommu.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-arm/page-nommu.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-arm/page-nommu.h
@@ -43,7 +43,7 @@ typedef unsigned long pgprot_t;

#define __pgprot(x) (x)

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

extern unsigned long memory_start;
extern unsigned long memory_end;

include/asm-avr32/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-avr32/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-avr32/page.h
@@ -58,7 +58,7 @@ static inline int get_order(unsigned lon

#endif /* !__ASSEMBLY__ */

/* Align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

/*
* The hardware maps the virtual addresses 0x80000000 -> 0x9fffffff

include/asm-blackfin/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-blackfin/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-blackfin/page.h
@@ -52,7 +52,7 @@ typedef struct page *pgtable_t;

#define __pgprot(x) ((pgprot_t) { (x) } )

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

extern unsigned long memory_start;
extern unsigned long memory_end;

include/asm-cris/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-cris/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-cris/page.h
@@ -61,7 +61,7 @@ typedef struct page *pgtable_t;

#define page_to_phys(page) __pa((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#ifndef __ASSEMBLY__

include/asm-frv/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-frv/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-frv/page.h
@@ -41,7 +41,7 @@ typedef struct page *pgtable_t;

#define PTE_MASK PAGE_MASK

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#define devmem_is_allowed(pfn) 1

include/asm-h8300/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-h8300/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-h8300/page.h
@@ -44,7 +44,7 @@ typedef struct page *pgtable_t;

#define __pgprot(x) ((pgprot_t) { (x) } )

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

extern unsigned long memory_start;
extern unsigned long memory_end;

include/asm-ia64/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-ia64/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-ia64/page.h
@@ -40,7 +40,7 @@

#define PAGE_SIZE (__IA64_UL_CONST(1) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE - 1))
-#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#define PERCPU_PAGE_SHIFT 16 /* log2() of max. size of per-CPU area */
#define PERCPU_PAGE_SIZE (__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT)

include/asm-m32r/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-m32r/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-m32r/page.h
@@ -42,7 +42,7 @@ typedef struct page *pgtable_t;

#endif /* !__ASSEMBLY__ */

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

/*
* This handles the memory map.. We could make this a config

include/asm-m68k/dvma.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-m68k/dvma.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-m68k/dvma.h
@@ -13,7 +13,7 @@

#define DVMA_PAGE_SHIFT 13
#define DVMA_PAGE_SIZE (1UL << DVMA_PAGE_SHIFT)
#define DVMA_PAGE_MASK (~(DVMA_PAGE_SIZE-1))
-#define DVMA_PAGE_ALIGN(addr) (((addr)+DVMA_PAGE_SIZE-1)&DVMA_PAGE_MASK)
+#define DVMA_PAGE_ALIGN(addr) ALIGN(addr, DVMA_PAGE_SIZE)

extern void dvma_init(void);
extern int dvma_map_iommu(unsigned long kaddr, unsigned long baddr,

include/asm-m68k/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-m68k/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-m68k/page.h
@@ -104,7 +104,7 @@ typedef struct page *pgtable_t;

#define __pgprot(x) ((pgprot_t) { (x) } )

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#endif /* !__ASSEMBLY__ */

include/asm-m68knommu/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-m68knommu/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-m68knommu/page.h
@@ -44,7 +44,7 @@ typedef struct page *pgtable_t;

#define __pgprot(x) ((pgprot_t) { (x) } )

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

extern unsigned long memory_start;
extern unsigned long memory_end;

include/asm-mips/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-mips/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-mips/page.h
@@ -135,7 +135,7 @@ typedef struct { unsigned long pgprot; }

#endif /* !__ASSEMBLY__ */

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

/*
* __pa()/__va() should be used only during mem init.

include/asm-mn10300/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-mn10300/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-mn10300/page.h
@@ -62,7 +62,7 @@ typedef struct page *pgtable_t;

#endif /* !__ASSEMBLY__ */

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

/*
* This handles the memory map.. We could make this a config

include/asm-parisc/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-parisc/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-parisc/page.h
@@ -120,7 +120,7 @@ extern int npmem_ranges;

#define PTE_ENTRY_SIZE (1UL << BITS_PER_PTE_ENTRY)

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#define LINUX_GATEWAY_SPACE 0

include/asm-s390/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-s390/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-s390/page.h
@@ -139,7 +139,7 @@ void arch_alloc_page(struct page *page, #endif /* !__ASSEMBLY__ */

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#define __PAGE_OFFSET 0x0UL
#define PAGE_OFFSET 0x0UL

include/asm-sh/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-sh/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-sh/page.h
@@ -25,7 +25,7 @@

#define PTE_MASK PAGE_MASK

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
#define HPAGE_SHIFT 16

include/asm-sparc/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-sparc/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-sparc/page.h
@@ -137,7 +137,7 @@ BTFIXUPDEF_SETHI(sparc_unmapped_base)

#endif /* !(__ASSEMBLY__) */

/* to align the pointer to the (next) page boundary */ -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) +#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#define PAGE_OFFSET 0xf0000000
#ifndef __ASSEMBLY__

include/asm-sparc64/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-sparc64/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-sparc64/page.h
@@ -111,7 +111,7 @@ typedef struct page *pgtable_t;

#endif /* !(__ASSEMBLY__) */

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

/* We used to stick this into a hard-coded global register (%g4)
* but that does not make sense anymore.

include/asm-um/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-um/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-um/page.h
@@ -93,7 +93,7 @@ typedef struct page *pgtable_t;

#define __pgprot(x) ((pgprot_t) { (x) } )

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

extern unsigned long uml_physmem;

include/asm-x86/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-x86/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-x86/page.h
@@ -32,7 +32,7 @@

#define HUGE_MAX_HSTATE 2

/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#ifndef __ASSEMBLY__
#include <linux/types.h>

include/asm-xtensa/page.h +0 -0

diff -urpN linux-2.6.26-rc5-mm3/include/asm-xtensa/page.h linux-2.6.26-rc5-mm3-fix-64-bit-page-align/include/asm-xtensa/page.h
@@ -32,7 +32,7 @@

#define PAGE_SHIFT 12
#define PAGE_SIZE (__XTENSA_UL_CONST(1) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE - 1) & PAGE_MASK)
+#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)

#define PAGE_OFFSET XCHAL_KSEG_CACHED_VADDR
#define MAX_MEM_PFN XCHAL_KSEG_SIZE