diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /include/asm-sh/page.h | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sh/page.h')
| -rw-r--r-- | include/asm-sh/page.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index 5dc01d2fcc4c..77fb8bf02e4e 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h | |||
| @@ -12,6 +12,8 @@ | |||
| 12 | # define PAGE_SHIFT 12 | 12 | # define PAGE_SHIFT 12 |
| 13 | #elif defined(CONFIG_PAGE_SIZE_8KB) | 13 | #elif defined(CONFIG_PAGE_SIZE_8KB) |
| 14 | # define PAGE_SHIFT 13 | 14 | # define PAGE_SHIFT 13 |
| 15 | #elif defined(CONFIG_PAGE_SIZE_16KB) | ||
| 16 | # define PAGE_SHIFT 14 | ||
| 15 | #elif defined(CONFIG_PAGE_SIZE_64KB) | 17 | #elif defined(CONFIG_PAGE_SIZE_64KB) |
| 16 | # define PAGE_SHIFT 16 | 18 | # define PAGE_SHIFT 16 |
| 17 | #else | 19 | #else |