diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:25:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:25:09 -0700 |
commit | 851b147e4411df6a1e7e90e2a609773c277eefd2 (patch) | |
tree | 3d3dd17a4e3ff0a6fd0c571d449085d411f7dc17 /arch/m32r/include/asm/page.h | |
parent | 8e44e4347735229b518cc02938c351428bcd7492 (diff) | |
parent | 85233c43f7fece10a3ea8ed34f0d546b8dd3a435 (diff) | |
download | kernel_samsung_smdk4412-851b147e4411df6a1e7e90e2a609773c277eefd2.zip kernel_samsung_smdk4412-851b147e4411df6a1e7e90e2a609773c277eefd2.tar.gz kernel_samsung_smdk4412-851b147e4411df6a1e7e90e2a609773c277eefd2.tar.bz2 |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: Cleanup linker script using new linker script macros.
m32r: Move the spi_stack_top and spu_stack_top into .init.data section.
m32r: Remove unused .altinstructions and .exit.* code from linker script.
m32r: Move GET_THREAD_INFO definition out of asm/thread_info.h.
m32r: Define THREAD_SIZE only once.
m32r: make PAGE_SIZE available to assembly.
Diffstat (limited to 'arch/m32r/include/asm/page.h')
-rw-r--r-- | arch/m32r/include/asm/page.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m32r/include/asm/page.h b/arch/m32r/include/asm/page.h index 11777f7..725ede8 100644 --- a/arch/m32r/include/asm/page.h +++ b/arch/m32r/include/asm/page.h @@ -1,9 +1,11 @@ #ifndef _ASM_M32R_PAGE_H #define _ASM_M32R_PAGE_H +#include <linux/const.h> + /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) +#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) #ifndef __ASSEMBLY__ |