[PATCH] sysctl: s390: move sysctl definitions to sysctl.h
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 14 Feb 2007 08:33:45 +0000 (00:33 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Feb 2007 16:09:57 +0000 (08:09 -0800)
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: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/s390/appldata/appldata.h
arch/s390/kernel/debug.c
arch/s390/mm/cmm.c
include/linux/sysctl.h

index 0429481dea633b9fe2bffb6aff2e50d6f60d6857..4069b81f7f1d159f1fb2b6fc1bc6b9f7d788a8a0 100644 (file)
@@ -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
index 51653d82d7df74bcaf8a5607ea1340fdd176dffc..3fcde156ff3a78677c47a79c3283ee41a66d685a 100644 (file)
@@ -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
 
index f93a056869bc5aa7d38f1a88810acf019029eacf..ccb9ab5c73b36892881d1357503329ebc55300bf 100644 (file)
@@ -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[];
 
index 113b92bbe4b90cc2d70e03a52eb44e631c8d1956..76541a630770fcfc8d26bba923dc1ca5ce0e6f07 100644 (file)
@@ -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,
 };