diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-s390/page.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
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__ |