xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2010-08-05 08:57:50 -07:00
parent c3d1f1746b 9354a55f94
commit 93b9e9a2d9
10 changed files with 1110 additions and 9560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/page.h
View File

@@ -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)