Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] cio: Register/unregister subchannels only from kslowcrw.
  [S390] Add missing die_notifier() call to die().
  [S390] Fix memory detection.
  [S390] Explicitly code allocpercpu calls in iucv
  [S390] Dont overwrite lowcores on smp_send_stop().
  [S390] Optimize storage key handling for anonymous pages
  [S390] Fix kernel preemption.
  [S390] appldata: remove unused binary sysctls.
  [S390] cmm: remove unused binary sysctls.
  [S390] Fix irq tracing and lockdep_sys_exit calls.
  [S390] magic sysrq: check for in_atomic before doing an console_unblank
  [S390] cio: change device sense procedure to work with pav aliases

1 files changed, 0 insertions, 14 deletions

diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index 4abc6d2306f4..8f5baac1eb08 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -140,9 +140,6 @@ static struct trans_ctl_table trans_vm_table[] = {
         { VM_PANIC_ON_OOM,              "panic_on_oom" },
         { VM_VDSO_ENABLED,              "vdso_enabled" },
         { VM_MIN_SLAB,                  "min_slab_ratio" },
-        { VM_CMM_PAGES,                 "cmm_pages" },
-        { VM_CMM_TIMED_PAGES,           "cmm_timed_pages" },
-        { VM_CMM_TIMEOUT,               "cmm_timeout" },
 
         {}
 };
@@ -1219,16 +1216,6 @@ static struct trans_ctl_table trans_arlan_table[] = {
         {}
 };
 
-static struct trans_ctl_table trans_appldata_table[] = {
-        { CTL_APPLDATA_TIMER,           "timer" },
-        { CTL_APPLDATA_INTERVAL,        "interval" },
-        { CTL_APPLDATA_OS,              "os" },
-        { CTL_APPLDATA_NET_SUM,         "net_sum" },
-        { CTL_APPLDATA_MEM,             "mem" },
-        {}
-
-};
-
 static struct trans_ctl_table trans_s390dbf_table[] = {
         { 5678 /* CTL_S390DBF_STOPPABLE */,     "debug_stoppable" },
         { 5679 /* CTL_S390DBF_ACTIVE */,        "debug_active" },
@@ -1273,7 +1260,6 @@ static struct trans_ctl_table trans_root_table[] = {
         { CTL_ABI,      "abi" },
         /* CTL_CPU not used */
         { CTL_ARLAN,    "arlan",        trans_arlan_table },
-        { CTL_APPLDATA, "appldata",     trans_appldata_table },
         { CTL_S390DBF,  "s390dbf",      trans_s390dbf_table },
         { CTL_SUNRPC,   "sunrpc",       trans_sunrpc_table },
         { CTL_PM,       "pm",           trans_pm_table },