Skip to content

Commit 46ba4d0

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390/sysctl: Remove "vm/allocate_pgste" sysctl
Remove the not needed "vm/allocate_pgste" sysctl. It has no effect anymore. However this is a user space visible change. It shouldn't cause any problems, however if it does this needs to be partially reverted. Note that some distributions set vm/allocate_pgste=1 in one of the various sysctl configuration files. Besides a warning about the (now) non-existent procfs file this doesn't cause any problems. Reviewed-by: Alexander Gordeev <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 174cb82 commit 46ba4d0

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

arch/s390/include/asm/pgalloc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ unsigned long *page_table_alloc(struct mm_struct *);
2626
struct ptdesc *page_table_alloc_pgste(struct mm_struct *mm);
2727
void page_table_free(struct mm_struct *, unsigned long *);
2828
void page_table_free_pgste(struct ptdesc *ptdesc);
29-
extern int page_table_allocate_pgste;
3029

3130
static inline void crst_table_init(unsigned long *crst, unsigned long entry)
3231
{

arch/s390/mm/pgalloc.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,6 @@
1616
#include <asm/tlb.h>
1717
#include <asm/tlbflush.h>
1818

19-
#ifdef CONFIG_PGSTE
20-
21-
int page_table_allocate_pgste = 0;
22-
EXPORT_SYMBOL(page_table_allocate_pgste);
23-
24-
static const struct ctl_table page_table_sysctl[] = {
25-
{
26-
.procname = "allocate_pgste",
27-
.data = &page_table_allocate_pgste,
28-
.maxlen = sizeof(int),
29-
.mode = S_IRUGO | S_IWUSR,
30-
.proc_handler = proc_dointvec_minmax,
31-
.extra1 = SYSCTL_ZERO,
32-
.extra2 = SYSCTL_ONE,
33-
},
34-
};
35-
36-
static int __init page_table_register_sysctl(void)
37-
{
38-
return register_sysctl("vm", page_table_sysctl) ? 0 : -ENOMEM;
39-
}
40-
__initcall(page_table_register_sysctl);
41-
42-
#endif /* CONFIG_PGSTE */
43-
4419
unsigned long *crst_table_alloc(struct mm_struct *mm)
4520
{
4621
struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, CRST_ALLOC_ORDER);

0 commit comments

Comments
 (0)