diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:05 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:05 +0900 |
| commit | ef4ed97d6bd91aa41907181e80a7feaf2721719a (patch) | |
| tree | adc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/include/asm/page.h | |
| parent | Merge branch 'sh/clkfwk' (diff) | |
| parent | sh: Ensure active regions have a backing PMB entry. (diff) | |
| download | linux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.tar.xz linux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.zip | |
Merge branch 'sh/lmb'
Conflicts:
arch/sh/kernel/setup.c
Diffstat (limited to 'arch/sh/include/asm/page.h')
| -rw-r--r-- | arch/sh/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h index 0152c040f6c3..fb703d120d09 100644 --- a/arch/sh/include/asm/page.h +++ b/arch/sh/include/asm/page.h @@ -49,7 +49,7 @@ extern unsigned long shm_align_mask; extern unsigned long max_low_pfn, min_low_pfn; -extern unsigned long memory_start, memory_end; +extern unsigned long memory_start, memory_end, memory_limit; static inline unsigned long pages_do_alias(unsigned long addr1, unsigned long addr2) |