Skip to content

Commit

Permalink
ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
Browse files Browse the repository at this point in the history
Makes it consistent with VMALLOC_START

Tested-by: H Hartley Sweeten <[email protected]>
Signed-off-by: Andreas Fenkart <[email protected]>
Signed-off-by: Russell King <[email protected]>
  • Loading branch information
Fenkart/Bostandzhyan authored and Russell King committed Feb 15, 2010
1 parent a7bd08c commit c931b4f
Show file tree
Hide file tree
Showing 30 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions arch/arm/include/asm/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@
#endif

#ifndef PHYS_OFFSET
#define PHYS_OFFSET (CONFIG_DRAM_BASE)
#define PHYS_OFFSET UL(CONFIG_DRAM_BASE)
#endif

#ifndef END_MEM
#define END_MEM (CONFIG_DRAM_BASE + CONFIG_DRAM_SIZE)
#define END_MEM (UL(CONFIG_DRAM_BASE) + CONFIG_DRAM_SIZE)
#endif

#ifndef PAGE_OFFSET
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/include/asm/pgtable-nommu.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ extern unsigned int kobjsize(const void *objp);
* All 32bit addresses are effectively valid for vmalloc...
* Sort of meaningless for non-VM targets.
*/
#define VMALLOC_START 0
#define VMALLOC_END 0xffffffff
#define VMALLOC_START 0UL
#define VMALLOC_END 0xffffffffUL

#define FIRST_USER_ADDRESS (0)

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-davinci/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* I/O mapping
*/
#define IO_PHYS 0x01c00000
#define IO_PHYS 0x01c00000UL
#define IO_OFFSET 0xfd000000 /* Virtual IO = 0xfec00000 */
#define IO_SIZE 0x00400000
#define IO_VIRT (IO_PHYS + IO_OFFSET)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-dove/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* arch/arm/mach-dove/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfd800000
#define VMALLOC_END 0xfd800000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-ep93xx/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* arch/arm/mach-ep93xx/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfe800000
#define VMALLOC_END 0xfe800000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-gemini/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* (at your option) any later version.
*/

#define VMALLOC_END 0xF0000000
#define VMALLOC_END 0xf0000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-iop32x/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* arch/arm/mach-iop32x/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfe000000
#define VMALLOC_END 0xfe000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-iop33x/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* arch/arm/mach-iop33x/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfe000000
#define VMALLOC_END 0xfe000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp2000/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
* The vmalloc() routines leaves a hole of 4kB between each vmalloced
* area for the same reason. ;)
*/
#define VMALLOC_END 0xfb000000
#define VMALLOC_END 0xfb000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp23xx/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* specific static I/O.
*/

#define VMALLOC_END (0xec000000)
#define VMALLOC_END (0xec000000UL)
2 changes: 1 addition & 1 deletion arch/arm/mach-ixp4xx/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* arch/arm/mach-ixp4xx/include/mach/vmalloc.h
*/
#define VMALLOC_END (0xFF000000)
#define VMALLOC_END (0xff000000UL)

2 changes: 1 addition & 1 deletion arch/arm/mach-kirkwood/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* arch/arm/mach-kirkwood/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfe800000
#define VMALLOC_END 0xfe800000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-lh7a40x/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* version 2 as published by the Free Software Foundation.
*
*/
#define VMALLOC_END (0xe8000000)
#define VMALLOC_END (0xe8000000UL)
2 changes: 1 addition & 1 deletion arch/arm/mach-loki/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* arch/arm/mach-loki/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfe800000
#define VMALLOC_END 0xfe800000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-mmp/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* linux/arch/arm/mach-mmp/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfe000000
#define VMALLOC_END 0xfe000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-mv78xx0/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* arch/arm/mach-mv78xx0/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfe000000
#define VMALLOC_END 0xfe000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-nomadik/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

#define VMALLOC_END 0xe8000000
#define VMALLOC_END 0xe8000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-ns9xxx/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
#ifndef __ASM_ARCH_VMALLOC_H
#define __ASM_ARCH_VMALLOC_H

#define VMALLOC_END (0xf0000000)
#define VMALLOC_END (0xf0000000UL)

#endif /* ifndef __ASM_ARCH_VMALLOC_H */
2 changes: 1 addition & 1 deletion arch/arm/mach-orion5x/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* arch/arm/mach-orion5x/include/mach/vmalloc.h
*/

#define VMALLOC_END 0xfd800000
#define VMALLOC_END 0xfd800000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#define VMALLOC_END (0xe8000000)
#define VMALLOC_END (0xe8000000UL)
2 changes: 1 addition & 1 deletion arch/arm/mach-realview/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define VMALLOC_END 0xf8000000
#define VMALLOC_END 0xf8000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c24a0/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
#ifndef __ASM_ARCH_VMALLOC_H
#define __ASM_ARCH_VMALLOC_H

#define VMALLOC_END (0xE0000000)
#define VMALLOC_END (0xe0000000UL)

#endif /* __ASM_ARCH_VMALLOC_H */
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
* arch/arm/mach-sa1100/include/mach/vmalloc.h
*/
#define VMALLOC_END (0xe8000000)
#define VMALLOC_END (0xe8000000UL)
2 changes: 1 addition & 1 deletion arch/arm/mach-u300/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
* End must be above the I/O registers and on an even 2MiB boundary.
* Author: Linus Walleij <[email protected]>
*/
#define VMALLOC_END 0xfe800000
#define VMALLOC_END 0xfe800000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-ux500/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define VMALLOC_END 0xf0000000
#define VMALLOC_END 0xf0000000UL
2 changes: 1 addition & 1 deletion arch/arm/mach-w90x900/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
#ifndef __ASM_ARCH_VMALLOC_H
#define __ASM_ARCH_VMALLOC_H

#define VMALLOC_END (0xE0000000)
#define VMALLOC_END (0xe0000000UL)

#endif /* __ASM_ARCH_VMALLOC_H */
2 changes: 1 addition & 1 deletion arch/arm/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ void __init mem_init(void)
#ifdef CONFIG_MMU
MLM(CONSISTENT_BASE, CONSISTENT_END),
#endif
MLM(VMALLOC_START, (unsigned long)VMALLOC_END),
MLM(VMALLOC_START, VMALLOC_END),
MLM(PAGE_OFFSET, (unsigned long)high_memory),
#ifdef CONFIG_HIGHMEM
MLM(PKMAP_BASE, (PKMAP_BASE) + (LAST_PKMAP) *
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/plat-mxc/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
#define __ASM_ARCH_MXC_VMALLOC_H__

/* vmalloc ending address */
#define VMALLOC_END 0xF4000000
#define VMALLOC_END 0xf4000000UL

#endif /* __ASM_ARCH_MXC_VMALLOC_H__ */
2 changes: 1 addition & 1 deletion arch/arm/plat-s3c/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
#ifndef __ASM_ARCH_VMALLOC_H
#define __ASM_ARCH_VMALLOC_H

#define VMALLOC_END (0xE0000000)
#define VMALLOC_END (0xe0000000UL)

#endif /* __ASM_ARCH_VMALLOC_H */
2 changes: 1 addition & 1 deletion arch/arm/plat-stmp3xxx/include/mach/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
#define VMALLOC_END (0xF0000000)
#define VMALLOC_END 0xf0000000UL

0 comments on commit c931b4f

Please sign in to comment.