Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 27ac792ca0b0a1e7e65f20342260650516c95864

Authored by Andrea Righi
Committed by Linus Torvalds
1 parent d92bc31854
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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

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

[akpm@linux-foundation.org: fix drivers/media/video/uvc/uvc_queue.c]
[akpm@linux-foundation.org: fix v850]
[akpm@linux-foundation.org: fix powerpc]
[akpm@linux-foundation.org: fix arm]
[akpm@linux-foundation.org: fix mips]
[akpm@linux-foundation.org: fix drivers/media/video/pvrusb2/pvrusb2-dvb.c]
[akpm@linux-foundation.org: fix drivers/mtd/maps/uclinux.c]
[akpm@linux-foundation.org: fix powerpc]
Signed-off-by: Andrea Righi <righi.andrea@gmail.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 57 changed files with 36 additions and 74 deletions Side-by-side Diff

arch/arm/kernel/module.c
Diff comments   View file @ 27ac792
... ... @@ -13,6 +13,7 @@
13 13 #include <linux/module.h>
14 14 #include <linux/moduleloader.h>
15 15 #include <linux/kernel.h>
  16 +#include <linux/mm.h>
16 17 #include <linux/elf.h>
17 18 #include <linux/vmalloc.h>
18 19 #include <linux/slab.h>
arch/arm/plat-omap/fb.c
Diff comments   View file @ 27ac792
... ... @@ -23,6 +23,7 @@
23 23  
24 24 #include <linux/module.h>
25 25 #include <linux/kernel.h>
  26 +#include <linux/mm.h>
26 27 #include <linux/init.h>
27 28 #include <linux/platform_device.h>
28 29 #include <linux/bootmem.h>
arch/avr32/mm/ioremap.c
Diff comments   View file @ 27ac792
... ... @@ -6,6 +6,7 @@
6 6 * published by the Free Software Foundation.
7 7 */
8 8 #include <linux/vmalloc.h>
  9 +#include <linux/mm.h>
9 10 #include <linux/module.h>
10 11 #include <linux/io.h>
11 12  
arch/h8300/kernel/setup.c
Diff comments   View file @ 27ac792
... ... @@ -20,6 +20,7 @@
20 20 #include <linux/sched.h>
21 21 #include <linux/delay.h>
22 22 #include <linux/interrupt.h>
  23 +#include <linux/mm.h>
23 24 #include <linux/fs.h>
24 25 #include <linux/fb.h>
25 26 #include <linux/console.h>
arch/m68k/amiga/chipram.c
Diff comments   View file @ 27ac792
... ... @@ -9,6 +9,7 @@
9 9  
10 10 #include <linux/types.h>
11 11 #include <linux/kernel.h>
  12 +#include <linux/mm.h>
12 13 #include <linux/init.h>
13 14 #include <linux/ioport.h>
14 15 #include <linux/slab.h>
arch/m68knommu/kernel/setup.c
Diff comments   View file @ 27ac792
... ... @@ -22,6 +22,7 @@
22 22 #include <linux/interrupt.h>
23 23 #include <linux/fb.h>
24 24 #include <linux/module.h>
  25 +#include <linux/mm.h>
25 26 #include <linux/console.h>
26 27 #include <linux/errno.h>
27 28 #include <linux/string.h>
arch/mips/kernel/module.c
Diff comments   View file @ 27ac792
... ... @@ -22,6 +22,7 @@
22 22  
23 23 #include <linux/moduleloader.h>
24 24 #include <linux/elf.h>
  25 +#include <linux/mm.h>
25 26 #include <linux/vmalloc.h>
26 27 #include <linux/slab.h>
27 28 #include <linux/fs.h>
arch/mips/sgi-ip27/ip27-klnuma.c
Diff comments   View file @ 27ac792
... ... @@ -4,6 +4,7 @@
4 4 * Copyright 2000 - 2001 Kanoj Sarcar (kanoj@sgi.com)
5 5 */
6 6 #include <linux/init.h>
  7 +#include <linux/mm.h>
7 8 #include <linux/mmzone.h>
8 9 #include <linux/kernel.h>
9 10 #include <linux/nodemask.h>
arch/powerpc/kernel/suspend.c
Diff comments   View file @ 27ac792
... ... @@ -7,6 +7,7 @@
7 7 * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>
8 8 */
9 9  
  10 +#include <linux/mm.h>
10 11 #include <asm/page.h>
11 12  
12 13 /* References to section boundaries */
arch/powerpc/lib/code-patching.c
Diff comments   View file @ 27ac792
... ... @@ -10,6 +10,7 @@
10 10 #include <linux/kernel.h>
11 11 #include <linux/vmalloc.h>
12 12 #include <linux/init.h>
  13 +#include <linux/mm.h>
13 14 #include <asm/page.h>
14 15 #include <asm/code-patching.h>
15 16  
arch/sparc64/kernel/iommu_common.h
Diff comments   View file @ 27ac792
... ... @@ -23,7 +23,7 @@
23 23 #define IO_PAGE_SHIFT 13
24 24 #define IO_PAGE_SIZE (1UL << IO_PAGE_SHIFT)
25 25 #define IO_PAGE_MASK (~(IO_PAGE_SIZE-1))
26   -#define IO_PAGE_ALIGN(addr) (((addr)+IO_PAGE_SIZE-1)&IO_PAGE_MASK)
  26 +#define IO_PAGE_ALIGN(addr) ALIGN(addr, IO_PAGE_SIZE)
27 27  
28 28 #define IO_TSB_ENTRIES (128*1024)
29 29 #define IO_TSB_SIZE (IO_TSB_ENTRIES * 8)
arch/x86/kernel/module_64.c
Diff comments   View file @ 27ac792
... ... @@ -22,6 +22,7 @@
22 22 #include <linux/fs.h>
23 23 #include <linux/string.h>
24 24 #include <linux/kernel.h>
  25 +#include <linux/mm.h>
25 26 #include <linux/slab.h>
26 27 #include <linux/bug.h>
27 28  
arch/xtensa/kernel/setup.c
Diff comments   View file @ 27ac792
... ... @@ -16,6 +16,7 @@
16 16  
17 17 #include <linux/errno.h>
18 18 #include <linux/init.h>
  19 +#include <linux/mm.h>
19 20 #include <linux/proc_fs.h>
20 21 #include <linux/screen_info.h>
21 22 #include <linux/bootmem.h>
drivers/char/random.c
Diff comments   View file @ 27ac792
... ... @@ -236,6 +236,7 @@
236 236 #include <linux/fs.h>
237 237 #include <linux/genhd.h>
238 238 #include <linux/interrupt.h>
  239 +#include <linux/mm.h>
239 240 #include <linux/spinlock.h>
240 241 #include <linux/percpu.h>
241 242 #include <linux/cryptohash.h>
drivers/ieee1394/iso.c
Diff comments   View file @ 27ac792
... ... @@ -11,6 +11,7 @@
11 11  
12 12 #include <linux/pci.h>
13 13 #include <linux/sched.h>
  14 +#include <linux/mm.h>
14 15 #include <linux/slab.h>
15 16  
16 17 #include "hosts.h"
drivers/media/video/pvrusb2/pvrusb2-dvb.c
Diff comments   View file @ 27ac792
... ... @@ -20,6 +20,7 @@
20 20  
21 21 #include <linux/kthread.h>
22 22 #include <linux/freezer.h>
  23 +#include <linux/mm.h>
23 24 #include "dvbdev.h"
24 25 #include "pvrusb2-debug.h"
25 26 #include "pvrusb2-hdw-internal.h"
drivers/media/video/pvrusb2/pvrusb2-ioread.c
Diff comments   View file @ 27ac792
... ... @@ -22,6 +22,7 @@
22 22 #include "pvrusb2-debug.h"
23 23 #include <linux/errno.h>
24 24 #include <linux/string.h>
  25 +#include <linux/mm.h>
25 26 #include <linux/slab.h>
26 27 #include <linux/mutex.h>
27 28 #include <asm/uaccess.h>
drivers/media/video/uvc/uvc_queue.c
Diff comments   View file @ 27ac792
... ... @@ -13,6 +13,7 @@
13 13  
14 14 #include <linux/kernel.h>
15 15 #include <linux/version.h>
  16 +#include <linux/mm.h>
16 17 #include <linux/list.h>
17 18 #include <linux/module.h>
18 19 #include <linux/usb.h>
drivers/media/video/videobuf-core.c
Diff comments   View file @ 27ac792
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/init.h>
17 17 #include <linux/module.h>
18 18 #include <linux/moduleparam.h>
  19 +#include <linux/mm.h>
19 20 #include <linux/slab.h>
20 21 #include <linux/interrupt.h>
21 22  
drivers/mtd/maps/uclinux.c
Diff comments   View file @ 27ac792
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/init.h>
16 16 #include <linux/kernel.h>
17 17 #include <linux/fs.h>
  18 +#include <linux/mm.h>
18 19 #include <linux/major.h>
19 20 #include <linux/mtd/mtd.h>
20 21 #include <linux/mtd/map.h>
drivers/net/mlx4/eq.c
Diff comments   View file @ 27ac792
... ... @@ -33,6 +33,7 @@
33 33  
34 34 #include <linux/init.h>
35 35 #include <linux/interrupt.h>
  36 +#include <linux/mm.h>
36 37 #include <linux/dma-mapping.h>
37 38  
38 39 #include <linux/mlx4/cmd.h>
drivers/pcmcia/electra_cf.c
Diff comments   View file @ 27ac792
... ... @@ -28,6 +28,7 @@
28 28 #include <linux/init.h>
29 29 #include <linux/delay.h>
30 30 #include <linux/interrupt.h>
  31 +#include <linux/mm.h>
31 32 #include <linux/vmalloc.h>
32 33 #include <linux/of_platform.h>
33 34  
drivers/scsi/sun_esp.c
Diff comments   View file @ 27ac792
... ... @@ -7,6 +7,7 @@
7 7 #include <linux/types.h>
8 8 #include <linux/delay.h>
9 9 #include <linux/module.h>
  10 +#include <linux/mm.h>
10 11 #include <linux/init.h>
11 12  
12 13 #include <asm/irq.h>
drivers/video/acornfb.c
Diff comments   View file @ 27ac792
... ... @@ -23,6 +23,7 @@
23 23 #include <linux/string.h>
24 24 #include <linux/ctype.h>
25 25 #include <linux/slab.h>
  26 +#include <linux/mm.h>
26 27 #include <linux/init.h>
27 28 #include <linux/fb.h>
28 29 #include <linux/platform_device.h>
drivers/video/imxfb.c
Diff comments   View file @ 27ac792
... ... @@ -24,6 +24,7 @@
24 24 #include <linux/string.h>
25 25 #include <linux/interrupt.h>
26 26 #include <linux/slab.h>
  27 +#include <linux/mm.h>
27 28 #include <linux/fb.h>
28 29 #include <linux/delay.h>
29 30 #include <linux/init.h>
drivers/video/omap/dispc.c
Diff comments   View file @ 27ac792
... ... @@ -20,6 +20,7 @@
20 20 */
21 21 #include <linux/kernel.h>
22 22 #include <linux/dma-mapping.h>
  23 +#include <linux/mm.h>
23 24 #include <linux/vmalloc.h>
24 25 #include <linux/clk.h>
25 26 #include <linux/io.h>
drivers/video/omap/omapfb_main.c
Diff comments   View file @ 27ac792
... ... @@ -25,6 +25,7 @@
25 25 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
26 26 */
27 27 #include <linux/platform_device.h>
  28 +#include <linux/mm.h>
28 29 #include <linux/uaccess.h>
29 30  
30 31 #include <asm/mach-types.h>
drivers/video/pxafb.c
Diff comments   View file @ 27ac792
... ... @@ -30,6 +30,7 @@
30 30 #include <linux/string.h>
31 31 #include <linux/interrupt.h>
32 32 #include <linux/slab.h>
  33 +#include <linux/mm.h>
33 34 #include <linux/fb.h>
34 35 #include <linux/delay.h>
35 36 #include <linux/init.h>
drivers/video/sa1100fb.c
Diff comments   View file @ 27ac792
... ... @@ -167,6 +167,7 @@
167 167 #include <linux/string.h>
168 168 #include <linux/interrupt.h>
169 169 #include <linux/slab.h>
  170 +#include <linux/mm.h>
170 171 #include <linux/fb.h>
171 172 #include <linux/delay.h>
172 173 #include <linux/init.h>
include/asm-alpha/page.h
Diff comments   View file @ 27ac792
... ... @@ -80,9 +80,6 @@
80 80  
81 81 #endif /* !__ASSEMBLY__ */
82 82  
83   -/* to align the pointer to the (next) page boundary */
84   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
85   -
86 83 #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
87 84 #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
88 85 #ifndef CONFIG_DISCONTIGMEM
include/asm-arm/page-nommu.h
Diff comments   View file @ 27ac792
... ... @@ -7,6 +7,7 @@
7 7 * it under the terms of the GNU General Public License version 2 as
8 8 * published by the Free Software Foundation.
9 9 */
  10 +
10 11 #ifndef _ASMARM_PAGE_NOMMU_H
11 12 #define _ASMARM_PAGE_NOMMU_H
12 13  
... ... @@ -41,9 +42,6 @@
41 42 #define __pte(x) (x)
42 43 #define __pmd(x) (x)
43 44 #define __pgprot(x) (x)
44   -
45   -/* to align the pointer to the (next) page boundary */
46   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
47 45  
48 46 extern unsigned long memory_start;
49 47 extern unsigned long memory_end;
include/asm-arm/page.h
Diff comments   View file @ 27ac792
... ... @@ -15,9 +15,6 @@
15 15 #define PAGE_SIZE (1UL << PAGE_SHIFT)
16 16 #define PAGE_MASK (~(PAGE_SIZE-1))
17 17  
18   -/* to align the pointer to the (next) page boundary */
19   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
20   -
21 18 #ifndef __ASSEMBLY__
22 19  
23 20 #ifndef CONFIG_MMU
include/asm-avr32/page.h
Diff comments   View file @ 27ac792
... ... @@ -57,9 +57,6 @@
57 57  
58 58 #endif /* !__ASSEMBLY__ */
59 59  
60   -/* Align the pointer to the (next) page boundary */
61   -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
62   -
63 60 /*
64 61 * The hardware maps the virtual addresses 0x80000000 -> 0x9fffffff
65 62 * permanently to the physical addresses 0x00000000 -> 0x1fffffff when
include/asm-blackfin/page.h
Diff comments   View file @ 27ac792
... ... @@ -51,9 +51,6 @@
51 51 #define __pgd(x) ((pgd_t) { (x) } )
52 52 #define __pgprot(x) ((pgprot_t) { (x) } )
53 53  
54   -/* to align the pointer to the (next) page boundary */
55   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
56   -
57 54 extern unsigned long memory_start;
58 55 extern unsigned long memory_end;
59 56  
include/asm-cris/page.h
Diff comments   View file @ 27ac792
... ... @@ -60,9 +60,6 @@
60 60  
61 61 #define page_to_phys(page) __pa((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
62 62  
63   -/* to align the pointer to the (next) page boundary */
64   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
65   -
66 63 #ifndef __ASSEMBLY__
67 64  
68 65 #endif /* __ASSEMBLY__ */
include/asm-frv/page.h
Diff comments   View file @ 27ac792
... ... @@ -40,9 +40,6 @@
40 40 #define __pgprot(x) ((pgprot_t) { (x) } )
41 41 #define PTE_MASK PAGE_MASK
42 42  
43   -/* to align the pointer to the (next) page boundary */
44   -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
45   -
46 43 #define devmem_is_allowed(pfn) 1
47 44  
48 45 #define __pa(vaddr) virt_to_phys((void *) (unsigned long) (vaddr))
include/asm-h8300/page.h
Diff comments   View file @ 27ac792
... ... @@ -43,9 +43,6 @@
43 43 #define __pgd(x) ((pgd_t) { (x) } )
44 44 #define __pgprot(x) ((pgprot_t) { (x) } )
45 45  
46   -/* to align the pointer to the (next) page boundary */
47   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
48   -
49 46 extern unsigned long memory_start;
50 47 extern unsigned long memory_end;
51 48  
include/asm-ia64/page.h
Diff comments   View file @ 27ac792
... ... @@ -40,7 +40,6 @@
40 40  
41 41 #define PAGE_SIZE (__IA64_UL_CONST(1) << PAGE_SHIFT)
42 42 #define PAGE_MASK (~(PAGE_SIZE - 1))
43   -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
44 43  
45 44 #define PERCPU_PAGE_SHIFT 16 /* log2() of max. size of per-CPU area */
46 45 #define PERCPU_PAGE_SIZE (__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT)
include/asm-m32r/page.h
Diff comments   View file @ 27ac792
... ... @@ -41,9 +41,6 @@
41 41  
42 42 #endif /* !__ASSEMBLY__ */
43 43  
44   -/* to align the pointer to the (next) page boundary */
45   -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
46   -
47 44 /*
48 45 * This handles the memory map.. We could make this a config
49 46 * option, but too many people screw it up, and too few need
include/asm-m68k/dvma.h
Diff comments   View file @ 27ac792
... ... @@ -13,7 +13,7 @@
13 13 #define DVMA_PAGE_SHIFT 13
14 14 #define DVMA_PAGE_SIZE (1UL << DVMA_PAGE_SHIFT)
15 15 #define DVMA_PAGE_MASK (~(DVMA_PAGE_SIZE-1))
16   -#define DVMA_PAGE_ALIGN(addr) (((addr)+DVMA_PAGE_SIZE-1)&DVMA_PAGE_MASK)
  16 +#define DVMA_PAGE_ALIGN(addr) ALIGN(addr, DVMA_PAGE_SIZE)
17 17  
18 18 extern void dvma_init(void);
19 19 extern int dvma_map_iommu(unsigned long kaddr, unsigned long baddr,
include/asm-m68k/page.h
Diff comments   View file @ 27ac792
... ... @@ -103,9 +103,6 @@
103 103 #define __pgd(x) ((pgd_t) { (x) } )
104 104 #define __pgprot(x) ((pgprot_t) { (x) } )
105 105  
106   -/* to align the pointer to the (next) page boundary */
107   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
108   -
109 106 #endif /* !__ASSEMBLY__ */
110 107  
111 108 #include <asm/page_offset.h>
include/asm-m68knommu/page.h
Diff comments   View file @ 27ac792
... ... @@ -43,9 +43,6 @@
43 43 #define __pgd(x) ((pgd_t) { (x) } )
44 44 #define __pgprot(x) ((pgprot_t) { (x) } )
45 45  
46   -/* to align the pointer to the (next) page boundary */
47   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
48   -
49 46 extern unsigned long memory_start;
50 47 extern unsigned long memory_end;
51 48  
include/asm-mips/page.h
Diff comments   View file @ 27ac792
... ... @@ -137,9 +137,6 @@
137 137  
138 138 #endif /* !__ASSEMBLY__ */
139 139  
140   -/* to align the pointer to the (next) page boundary */
141   -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
142   -
143 140 /*
144 141 * __pa()/__va() should be used only during mem init.
145 142 */
include/asm-mips/processor.h
Diff comments   View file @ 27ac792
... ... @@ -45,7 +45,7 @@
45 45 * This decides where the kernel will search for a free chunk of vm
46 46 * space during mmap's.
47 47 */
48   -#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
  48 +#define TASK_UNMAPPED_BASE ((TASK_SIZE / 3) & ~(PAGE_SIZE))
49 49 #endif
50 50  
51 51 #ifdef CONFIG_64BIT
include/asm-mn10300/page.h
Diff comments   View file @ 27ac792
... ... @@ -61,9 +61,6 @@
61 61  
62 62 #endif /* !__ASSEMBLY__ */
63 63  
64   -/* to align the pointer to the (next) page boundary */
65   -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
66   -
67 64 /*
68 65 * This handles the memory map.. We could make this a config
69 66 * option, but too many people screw it up, and too few need
include/asm-parisc/page.h
Diff comments   View file @ 27ac792
... ... @@ -119,10 +119,6 @@
119 119 #define PMD_ENTRY_SIZE (1UL << BITS_PER_PMD_ENTRY)
120 120 #define PTE_ENTRY_SIZE (1UL << BITS_PER_PTE_ENTRY)
121 121  
122   -/* to align the pointer to the (next) page boundary */
123   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
124   -
125   -
126 122 #define LINUX_GATEWAY_SPACE 0
127 123  
128 124 /* This governs the relationship between virtual and physical addresses.
include/asm-powerpc/page.h
Diff comments   View file @ 27ac792
... ... @@ -119,9 +119,6 @@
119 119 /* align addr on a size boundary - adjust address up if needed */
120 120 #define _ALIGN(addr,size) _ALIGN_UP(addr,size)
121 121  
122   -/* to align the pointer to the (next) page boundary */
123   -#define PAGE_ALIGN(addr) _ALIGN(addr, PAGE_SIZE)
124   -
125 122 /*
126 123 * Don't compare things with KERNELBASE or PAGE_OFFSET to test for
127 124 * "kernelness", use is_kernel_addr() - it should do what you want.
include/asm-s390/page.h
Diff comments   View file @ 27ac792
... ... @@ -138,9 +138,6 @@
138 138  
139 139 #endif /* !__ASSEMBLY__ */
140 140  
141   -/* to align the pointer to the (next) page boundary */
142   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
143   -
144 141 #define __PAGE_OFFSET 0x0UL
145 142 #define PAGE_OFFSET 0x0UL
146 143 #define __pa(x) (unsigned long)(x)
include/asm-sh/page.h
Diff comments   View file @ 27ac792
... ... @@ -22,9 +22,6 @@
22 22 #define PAGE_MASK (~(PAGE_SIZE-1))
23 23 #define PTE_MASK PAGE_MASK
24 24  
25   -/* to align the pointer to the (next) page boundary */
26   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
27   -
28 25 #if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
29 26 #define HPAGE_SHIFT 16
30 27 #elif defined(CONFIG_HUGETLB_PAGE_SIZE_256K)
include/asm-sparc/page_32.h
Diff comments   View file @ 27ac792
... ... @@ -134,9 +134,6 @@
134 134  
135 135 #endif /* !(__ASSEMBLY__) */
136 136  
137   -/* to align the pointer to the (next) page boundary */
138   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
139   -
140 137 #define PAGE_OFFSET 0xf0000000
141 138 #ifndef __ASSEMBLY__
142 139 extern unsigned long phys_base;
include/asm-sparc/page_64.h
Diff comments   View file @ 27ac792
... ... @@ -106,9 +106,6 @@
106 106  
107 107 #endif /* !(__ASSEMBLY__) */
108 108  
109   -/* to align the pointer to the (next) page boundary */
110   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
111   -
112 109 /* We used to stick this into a hard-coded global register (%g4)
113 110 * but that does not make sense anymore.
114 111 */
include/asm-um/page.h
Diff comments   View file @ 27ac792
... ... @@ -92,9 +92,6 @@
92 92 #define __pgd(x) ((pgd_t) { (x) } )
93 93 #define __pgprot(x) ((pgprot_t) { (x) } )
94 94  
95   -/* to align the pointer to the (next) page boundary */
96   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
97   -
98 95 extern unsigned long uml_physmem;
99 96  
100 97 #define PAGE_OFFSET (uml_physmem)
include/asm-v850/page.h
Diff comments   View file @ 27ac792
... ... @@ -94,10 +94,6 @@
94 94 #endif /* !__ASSEMBLY__ */
95 95  
96 96  
97   -/* to align the pointer to the (next) page boundary */
98   -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
99   -
100   -
101 97 /* No current v850 processor has virtual memory. */
102 98 #define __virt_to_phys(addr) (addr)
103 99 #define __phys_to_virt(addr) (addr)
include/asm-x86/page.h
Diff comments   View file @ 27ac792
... ... @@ -34,9 +34,6 @@
34 34  
35 35 #define HUGE_MAX_HSTATE 2
36 36  
37   -/* to align the pointer to the (next) page boundary */
38   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
39   -
40 37 #ifndef __ASSEMBLY__
41 38 #include <linux/types.h>
42 39 #endif
include/asm-xtensa/page.h
Diff comments   View file @ 27ac792
... ... @@ -26,13 +26,11 @@
26 26  
27 27 /*
28 28 * PAGE_SHIFT determines the page size
29   - * PAGE_ALIGN(x) aligns the pointer to the (next) page boundary
30 29 */
31 30  
32 31 #define PAGE_SHIFT 12
33 32 #define PAGE_SIZE (__XTENSA_UL_CONST(1) << PAGE_SHIFT)
34 33 #define PAGE_MASK (~(PAGE_SIZE-1))
35   -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE - 1) & PAGE_MASK)
36 34  
37 35 #define PAGE_OFFSET XCHAL_KSEG_CACHED_VADDR
38 36 #define MAX_MEM_PFN XCHAL_KSEG_SIZE
... ... @@ -41,6 +41,9 @@
41 41  
42 42 #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))
43 43  
  44 +/* to align the pointer to the (next) page boundary */
  45 +#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
  46 +
44 47 /*
45 48 * Linux kernel virtual memory manager primitives.
46 49 * The idea being to have a "virtual" mm in the same way
... ... @@ -21,6 +21,7 @@
21 21  
22 22 #include <linux/init.h>
23 23 #include <linux/time.h>
  24 +#include <linux/mm.h>
24 25 #include <linux/smp_lock.h>
25 26 #include <linux/string.h>
26 27 #include <sound/core.h>