Remove definitions of PAGE_* from the user view Delete unnecessary comments referring to the size of pages Only include <asm-generic> if we're in __KERNEL__
Unified · Split
| @@ -1,22 +1,14 @@ | ||
| 1 | 1 | #ifndef _PARISC_PAGE_H |
| 2 | 2 | #define _PARISC_PAGE_H |
| 3 | 3 | |
| 4 | −#if !defined(__KERNEL__) | |
| 5 | −/* this is for userspace applications (4k page size) */ | |
| 6 | −# define PAGE_SHIFT 12 /* 4k */ | |
| 7 | −# define PAGE_SIZE (1UL << PAGE_SHIFT) | |
| 8 | −# define PAGE_MASK (~(PAGE_SIZE-1)) | |
| 9 | −#endif | |
| 10 | − | |
| 11 | − | |
| 12 | 4 | #ifdef __KERNEL__ |
| 13 | 5 | |
| 14 | 6 | #if defined(CONFIG_PARISC_PAGE_SIZE_4KB) |
| 15 | −# define PAGE_SHIFT 12 /* 4k */ | |
| 7 | +# define PAGE_SHIFT 12 | |
| 16 | 8 | #elif defined(CONFIG_PARISC_PAGE_SIZE_16KB) |
| 17 | −# define PAGE_SHIFT 14 /* 16k */ | |
| 9 | +# define PAGE_SHIFT 14 | |
| 18 | 10 | #elif defined(CONFIG_PARISC_PAGE_SIZE_64KB) |
| 19 | −# define PAGE_SHIFT 16 /* 64k */ | |
| 11 | +# define PAGE_SHIFT 16 | |
| 20 | 12 | #else |
| 21 | 13 | # error "unknown default kernel page size" |
| 22 | 14 | #endif |
| @@ -188,9 +180,9 @@ extern int npmem_ranges; · 165 unmodified lines | ||
| 188 | 180 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
| 189 | 181 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 190 | 182 | |
| 191 | −#endif /* __KERNEL__ */ | |
| 192 | − | |
| 193 | 183 | #include <asm-generic/memory_model.h> |
| 194 | 184 | #include <asm-generic/page.h> |
| 195 | 185 | |
| 186 | +#endif /* __KERNEL__ */ | |
| 187 | + | |
| 196 | 188 | #endif /* _PARISC_PAGE_H */ |