diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:57:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:57:50 -0700 |
| commit | 93b9e9a2d91b8a6c93f14e98382694f83de9f02e (patch) | |
| tree | 0344741b0dbac09aea7f289ad25f412923c9d165 /arch/ia64/include/asm | |
| parent | c3d1f1746b966907ba5ad2f75ddca24db8b21147 (diff) | |
| parent | 9354a55f9490aff8e5d4abedec3db78093772cae (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] increase ia64 static per cpu area
[IA64] Put ia64 config files on the Uwe Kleine-König diet
[IA64] perfmon: convert to unlocked_ioctl
[IA64] beautify vmlinux.lds.h
Diffstat (limited to 'arch/ia64/include/asm')
| -rw-r--r-- | arch/ia64/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/page.h b/arch/ia64/include/asm/page.h index 5f271bc712e..41b6d31110f 100644 --- a/arch/ia64/include/asm/page.h +++ b/arch/ia64/include/asm/page.h @@ -41,7 +41,7 @@ #define PAGE_SIZE (__IA64_UL_CONST(1) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE - 1)) -#define PERCPU_PAGE_SHIFT 16 /* log2() of max. size of per-CPU area */ +#define PERCPU_PAGE_SHIFT 18 /* log2() of max. size of per-CPU area */ #define PERCPU_PAGE_SIZE (__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT) |