Commit feceb63e authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] sysctl: s390: move sysctl definitions to sysctl.h 



We need to have the the definition of all top level sysctl directories
registers in sysctl.h so we don't conflict by accident and cause abi problems.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d8cb8a1

arch/s390/appldata/appldata.h

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#define APPLDATA_RECORD_NET_SUM_ID	0x03	/* must be < 256 !     */

#define APPLDATA_RECORD_PROC_ID		0x04



#define CTL_APPLDATA 		2120	/* sysctl IDs, must be unique */

#define CTL_APPLDATA_TIMER 	2121

#define CTL_APPLDATA_TIMER 	2121	/* sysctl IDs, must be unique */

#define CTL_APPLDATA_INTERVAL 	2122

#define CTL_APPLDATA_MEM	2123

#define CTL_APPLDATA_OS		2124

arch/s390/kernel/debug.c

+0 −1
Original line number Diff line number Diff line
@@ -852,7 +852,6 @@ debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level, 
static int debug_stoppable=1;

static int debug_active=1;



#define CTL_S390DBF 5677

#define CTL_S390DBF_STOPPABLE 5678

#define CTL_S390DBF_ACTIVE 5679

arch/s390/mm/cmm.c

+0 −4
Original line number Diff line number Diff line
@@ -256,10 +256,6 @@ cmm_skip_blanks(char *cp, char **endp) 
}



#ifdef CONFIG_CMM_PROC

/* These will someday get removed. */

#define VM_CMM_PAGES		1111

#define VM_CMM_TIMED_PAGES	1112

#define VM_CMM_TIMEOUT		1113



static struct ctl_table cmm_table[];

include/linux/sysctl.h

+7 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ enum 
	CTL_BUS=8,		/* Busses */

	CTL_ABI=9,		/* Binary emulation */

	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */

	CTL_APPLDATA=2120,	/* s390 appldata */

	CTL_S390DBF=5677,	/* s390 debug */

	CTL_SUNRPC=7249,	/* sunrpc debug */

	CTL_PM=9899,		/* frv power management */

	CTL_FRV=9898,		/* frv specific sysctls */
@@ -205,6 +207,11 @@ enum 
	VM_PANIC_ON_OOM=33,	/* panic at out-of-memory */

	VM_VDSO_ENABLED=34,	/* map VDSO into new processes? */

	VM_MIN_SLAB=35,		 /* Percent pages ignored by zone reclaim */



	/* s390 vm cmm sysctls */

	VM_CMM_PAGES=1111,

	VM_CMM_TIMED_PAGES=1112,

	VM_CMM_TIMEOUT=1113,

};