diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-02 16:21:12 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-04 14:41:13 -0400 |
| commit | 5386e735897afd8bcd332caf21a5f68d9e0e81c6 (patch) | |
| tree | 4149431c393c4aa5631d20790cdb238e718d5347 /arch/tile/include/hv | |
| parent | 28d717411badb78df71ecf087a07b93caf418f59 (diff) | |
arch/tile: kernel-related cleanups from removing static page size
User space code has been able to discover the static page size
by including a special <hv/pagesize.h> file. In the current release,
that file is now gone, and <asm/page.h> doesn't rely on it. The
getpagesize() API is now the only way for userspace to get the page size.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/include/hv')
| -rw-r--r-- | arch/tile/include/hv/hypervisor.h | 12 | ||||
| -rw-r--r-- | arch/tile/include/hv/pagesize.h | 32 |
2 files changed, 10 insertions, 34 deletions
diff --git a/arch/tile/include/hv/hypervisor.h b/arch/tile/include/hv/hypervisor.h index ee41bca4c8c..72ec1e972f1 100644 --- a/arch/tile/include/hv/hypervisor.h +++ b/arch/tile/include/hv/hypervisor.h | |||
| @@ -22,8 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #include <arch/chip.h> | 23 | #include <arch/chip.h> |
| 24 | 24 | ||
| 25 | #include <hv/pagesize.h> | ||
| 26 | |||
| 27 | /* Linux builds want unsigned long constants, but assembler wants numbers */ | 25 | /* Linux builds want unsigned long constants, but assembler wants numbers */ |
| 28 | #ifdef __ASSEMBLER__ | 26 | #ifdef __ASSEMBLER__ |
| 29 | /** One, for assembler */ | 27 | /** One, for assembler */ |
| @@ -44,11 +42,21 @@ | |||
| 44 | */ | 42 | */ |
| 45 | #define HV_L1_SPAN (__HV_SIZE_ONE << HV_LOG2_L1_SPAN) | 43 | #define HV_L1_SPAN (__HV_SIZE_ONE << HV_LOG2_L1_SPAN) |
| 46 | 44 | ||
| 45 | /** The log2 of the size of small pages, in bytes. This value should | ||
| 46 | * be verified at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_SMALL). | ||
| 47 | */ | ||
| 48 | #define HV_LOG2_PAGE_SIZE_SMALL 16 | ||
| 49 | |||
| 47 | /** The size of small pages, in bytes. This value should be verified | 50 | /** The size of small pages, in bytes. This value should be verified |
| 48 | * at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_SMALL). | 51 | * at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_SMALL). |
| 49 | */ | 52 | */ |
| 50 | #define HV_PAGE_SIZE_SMALL (__HV_SIZE_ONE << HV_LOG2_PAGE_SIZE_SMALL) | 53 | #define HV_PAGE_SIZE_SMALL (__HV_SIZE_ONE << HV_LOG2_PAGE_SIZE_SMALL) |
| 51 | 54 | ||
| 55 | /** The log2 of the size of large pages, in bytes. This value should be | ||
| 56 | * verified at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_LARGE). | ||
| 57 | */ | ||
| 58 | #define HV_LOG2_PAGE_SIZE_LARGE 24 | ||
| 59 | |||
| 52 | /** The size of large pages, in bytes. This value should be verified | 60 | /** The size of large pages, in bytes. This value should be verified |
| 53 | * at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_LARGE). | 61 | * at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_LARGE). |
| 54 | */ | 62 | */ |
diff --git a/arch/tile/include/hv/pagesize.h b/arch/tile/include/hv/pagesize.h deleted file mode 100644 index 58bed114fed..00000000000 --- a/arch/tile/include/hv/pagesize.h +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2010 Tilera Corporation. All Rights Reserved. | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or | ||
| 5 | * modify it under the terms of the GNU General Public License | ||
| 6 | * as published by the Free Software Foundation, version 2. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, but | ||
| 9 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or | ||
| 11 | * NON INFRINGEMENT. See the GNU General Public License for | ||
| 12 | * more details. | ||
| 13 | */ | ||
| 14 | |||
| 15 | /** | ||
| 16 | * @file pagesize.h | ||
| 17 | */ | ||
| 18 | |||
| 19 | #ifndef _HV_PAGESIZE_H | ||
| 20 | #define _HV_PAGESIZE_H | ||
| 21 | |||
| 22 | /** The log2 of the size of small pages, in bytes. This value should | ||
| 23 | * be verified at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_SMALL). | ||
| 24 | */ | ||
| 25 | #define HV_LOG2_PAGE_SIZE_SMALL 16 | ||
| 26 | |||
| 27 | /** The log2 of the size of large pages, in bytes. This value should be | ||
| 28 | * verified at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_LARGE). | ||
| 29 | */ | ||
| 30 | #define HV_LOG2_PAGE_SIZE_LARGE 24 | ||
| 31 | |||
| 32 | #endif /* _HV_PAGESIZE_H */ | ||
