diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-s390/page.h | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-s390/page.h')
| -rw-r--r-- | include/asm-s390/page.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h index 614e2a93c703..2be287b9df88 100644 --- a/include/asm-s390/page.h +++ b/include/asm-s390/page.h | |||
| @@ -16,6 +16,8 @@ | |||
| 16 | #define PAGE_SHIFT 12 | 16 | #define PAGE_SHIFT 12 |
| 17 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | 17 | #define PAGE_SIZE (1UL << PAGE_SHIFT) |
| 18 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 18 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
| 19 | #define PAGE_DEFAULT_ACC 0 | ||
| 20 | #define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4) | ||
| 19 | 21 | ||
| 20 | #ifdef __KERNEL__ | 22 | #ifdef __KERNEL__ |
| 21 | #ifndef __ASSEMBLY__ | 23 | #ifndef __ASSEMBLY__ |